Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable form category updates #1704

Merged
merged 6 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ const FormUpdateTab = ({ projectId }) => {
const dispatch = CoreModules.useAppDispatch();

const [uploadForm, setUploadForm] = useState<FileType[] | null>(null);
const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
const [error, setError] = useState({ formError: '', categoryError: '' });

const xFormId = CoreModules.useAppSelector((state) => state.project.projectInfo.xform_id);
const formCategoryList = useAppSelector((state) => state.createproject.formCategoryList);
const sortedFormCategoryList = formCategoryList.slice().sort((a, b) => a.title.localeCompare(b.title));
const customFileValidity = useAppSelector((state) => state.createproject.customFileValidity);
const validateCustomFormLoading = useAppSelector((state) => state.createproject.validateCustomFormLoading);
const selectedCategory = useAppSelector((state) => state.createproject.editProjectDetails.xform_category);
const formUpdateLoading = useAppSelector((state) => state.createproject.formUpdateLoading);

useEffect(() => {
Expand All @@ -44,10 +44,6 @@ const FormUpdateTab = ({ projectId }) => {
setError((prev) => ({ ...prev, formError: 'Form is required.' }));
isValid = false;
}
if (!selectedCategory) {
setError((prev) => ({ ...prev, categoryError: 'Category is required.' }));
isValid = false;
}
if (!customFileValidity && uploadForm && uploadForm.length > 0) {
dispatch(
CommonActions.SetSnackBar({
Expand Down Expand Up @@ -91,10 +87,8 @@ const FormUpdateTab = ({ projectId }) => {
valueKey="title"
label="title"
value={selectedCategory}
onValueChange={(value) => {
if (value) setSelectedCategory(value?.toString());
}}
className="fmtm-max-w-[13.5rem]"
disabled
/>
{error.categoryError && <p className="fmtm-text-primaryRed fmtm-text-base">{error.categoryError}</p>}
<p className="fmtm-text-base fmtm-mt-2">
Expand Down Expand Up @@ -133,6 +127,7 @@ const FormUpdateTab = ({ projectId }) => {
<div className="fmtm-flex fmtm-justify-center">
<Button
isLoading={formUpdateLoading}
disabled={validateCustomFormLoading}
loadingText="UPDATE"
onClick={onSave}
btnText="UPDATE"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ import CoreModules from '@/shared/CoreModules';
import { CommonActions } from '@/store/slices/CommonSlice';
import RichTextEditor from '@/components/common/Editor/Editor';
import useDocumentTitle from '@/utilfunctions/useDocumentTitle';
import { useAppSelector } from '@/types/reduxTypes';

const ProjectDescriptionTab = ({ projectId }) => {
useDocumentTitle('Manage Project: Project Description');
const dispatch = CoreModules.useAppDispatch();
const editProjectDetails: any = CoreModules.useAppSelector((state) => state.createproject.editProjectDetails);
const editProjectDetailsLoading: boolean = CoreModules.useAppSelector(
(state) => state.createproject.editProjectDetailsLoading,
);
const editProjectDetails = useAppSelector((state) => state.createproject.editProjectDetails);
const editProjectDetailsLoading = useAppSelector((state) => state.createproject.editProjectDetailsLoading);

const submission = () => {
const changedValues = diffObject(editProjectDetails, values);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';
import ProjectDescriptionTab from './ProjectDescriptionTab';
import FormUpdateTab from './FormUpdateTab';

Expand Down
14 changes: 11 additions & 3 deletions src/frontend/src/components/common/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,14 @@ interface ICustomSelect {
placeholder: string;
data: any;
dataKey: string;
value?: string | null;
value?: string | undefined;
valueKey: string;
label: string;
onValueChange: (value: string | null | number) => void;
onValueChange?: (value: string | null | number) => void;
errorMsg?: string;
className?: string;
required?: boolean;
disabled?: boolean;
}

export const CustomSelect = ({
Expand All @@ -118,6 +119,7 @@ export const CustomSelect = ({
errorMsg,
className,
required,
disabled = false,
}: ICustomSelect) => {
return (
<div className="fmtm-w-full">
Expand All @@ -129,7 +131,13 @@ export const CustomSelect = ({
)}
<div className="fmtm-flex fmtm-items-end">
<div className={`fmtm-w-full ${className}`}>
<Select value={value} onValueChange={(value) => onValueChange(value)}>
<Select
disabled={disabled}
value={value}
onValueChange={(value) => {
if (onValueChange) return onValueChange(value);
}}
>
<SelectTrigger className="fmtm-h-[2.35rem]">
<SelectValue placeholder={placeholder} />
</SelectTrigger>
Expand Down
7 changes: 1 addition & 6 deletions src/frontend/src/store/types/ICreateProject.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { task_split_type } from '@/types/enums';

export type CreateProjectStateTypes = {
editProjectDetails: EditProjectDetailsTypes;
editProjectDetails: ProjectDetailsTypes;
editProjectResponse?: EditProjectResponseTypes | null;
projectDetails: Partial<ProjectDetailsTypes>;
projectDetailsResponse: EditProjectResponseTypes | null;
Expand Down Expand Up @@ -86,11 +86,6 @@ type EditProjectResponseTypes = {
xform_category: string;
hashtags: string;
};
export type EditProjectDetailsTypes = {
name: string;
description: string;
short_description: string;
};

export type ProjectDetailsTypes = {
dimension: number;
Expand Down
Loading