Merge pull request #2207 from daostack/bugfix/CW-2181-common-without-…

…picture when try to create a common with no picture nothin happens #2181
daostack · Oct 17, 2023 · fd80c64 · fd80c64
2 parents 7a1884e + 98d1a14
commit fd80c64
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/...reation/components/ProjectCreation/components/ProjectCreationForm/ProjectCreationForm.tsx b/...reation/components/ProjectCreation/components/ProjectCreationForm/ProjectCreationForm.tsx
@@ -178,8 +178,12 @@ const ProjectCreationForm: FC<ProjectCreationFormProps> = (props) => {
         ref={formRef}
         initialValues={initialValues}
         onSubmit={isEditing ? handleProjectUpdate : handleProjectCreate}
-        items={getConfiguration(true, roles, {
-          existingNames: existingProjectsNames,
+        items={getConfiguration({
+          isProject: true,
+          roles,
+          shouldBeUnique: {
+            existingNames: existingProjectsNames,
+          },
         })}
         submitButtonText={isEditing ? "Save changes" : "Create Space"}
         disabled={isLoading}

diff --git a/...commonCreation/components/ProjectCreation/components/ProjectCreationForm/configuration.ts b/...commonCreation/components/ProjectCreation/components/ProjectCreationForm/configuration.ts
@@ -9,11 +9,20 @@ import {
 } from "../../constants";
 import styles from "./ProjectCreationForm.module.scss";
 
-export const getConfiguration = (
-  isProject = true,
-  roles?: Roles,
-  shouldBeUnique?: { existingNames: string[] },
-): CreationFormItem[] => {
+interface Options {
+  isProject: boolean;
+  roles?: Roles;
+  shouldBeUnique?: { existingNames: string[] };
+  isImageRequired?: boolean;
+}
+
+export const getConfiguration = (options: Options): CreationFormItem[] => {
+  const {
+    isProject = true,
+    roles,
+    shouldBeUnique,
+    isImageRequired = false,
+  } = options;
   const type = isProject ? "Space" : "Common";
 
   const items: CreationFormItem[] = [
@@ -22,9 +31,17 @@ export const getConfiguration = (
       className: styles.projectImages,
       props: {
         name: "projectImages",
-        label: `${type} picture`,
+        label: `${type} picture${isImageRequired ? " (required)" : ""}`,
         maxImagesAmount: 1,
       },
+      validation: isImageRequired
+        ? {
+            min: {
+              value: 1,
+              message: `${type} picture is required`,
+            },
+          }
+        : undefined,
     },
     {
       type: CreationFormItemType.TextField,

diff --git a/src/pages/commonCreation/hooks/useCommonForm.ts b/src/pages/commonCreation/hooks/useCommonForm.ts
@@ -76,6 +76,10 @@ export const useCommonForm = (
   return {
     initialValues,
     onSubmit,
-    formItems: getConfiguration(false, roles),
+    formItems: getConfiguration({
+      isProject: false,
+      roles,
+      isImageRequired: true,
+    }),
   };
 };