Revize 67683ef3

Changed default tag color

Default color in tag modal changed to color of a category

webapp/components/modals/CategoryModal.tsx

@@ -5 +5 @@
  * All values that the modal window can show.
  */
 export interface CategoryModalValues {
-    name: string;
-    color: string;
-    description: string;
-    disabledForAnnotators: boolean;
+    name?: string;
+    color?: string;
+    description?: string;
+    disabledForAnnotators?: boolean;
 }
 
 /**
@@ -23 +23 @@
     onSubmit: (val: CategoryModalValues) => void; // Method called when the modal is submitted
     defaultValues?: CategoryModalValues; // Default values of a form that contains properties of the category.
 }) {
-    /**
+    /*
      * Initialize default values if they were not set in props.
      */
-    const values = props.defaultValues ?? {
-        name: '',
-        color: 'black',
-        description: '',
-        disabledForAnnotators: false,
-    };
+    let values: CategoryModalValues;
+
+    if (props.defaultValues) {
+        values = {
+            name: props.defaultValues.name ?? '',
+            color: props.defaultValues.color ?? 'black',
+            description: props.defaultValues.description ?? '',
+            disabledForAnnotators: props.defaultValues.disabledForAnnotators ?? false,
+        };
+    } else {
+        values = {
+            name: '',
+            color: 'black',
+            description: '',
+            disabledForAnnotators: false,
+        };
+    }
 
     /**
      * The form.

webapp/components/modals/SubTagModal.tsx

@@ -5 +5 @@
  * All values that the modal window can show.
  */
 export interface SubTagModalValues {
-    name: string;
-    description: string;
+    name?: string;
+    description?: string;
 }
 
 /**
@@ -24 +24 @@
     /**
      * Initialize default values if they were not set in props.
      */
-    const values = props.defaultValues ?? {
-        name: '',
-        description: '',
-    };
+    let values: SubTagModalValues;
+
+    if (props.defaultValues) {
+        values = {
+            name: props.defaultValues.name ?? '',
+            description: props.defaultValues.description ?? '',
+        };
+    } else {
+        values = {
+            name: '',
+            description: '',
+        };
+    }
 
     /**
      * The form.

webapp/components/modals/TagModal.tsx

@@ -5 +5 @@
  * All values that the modal window can show.
  */
 export interface TagModalValues {
-    name: string;
-    color: string;
-    description: string;
+    name?: string;
+    color?: string;
+    description?: string;
 }
 
 /**
@@ -25 +25 @@
     /**
      * Initialize default values if they were not set in props.
      */
-    const values = props.defaultValues ?? {
-        name: '',
-        color: 'black',
-        description: '',
-    };
+    let values: TagModalValues;
 
+    if (props.defaultValues) {
+        values = {
+            name: props.defaultValues.name ?? '',
+            color: props.defaultValues.color ?? 'black',
+            description: props.defaultValues.description ?? '',
+        };
+    } else {
+        values = {
+            name: '',
+            color: 'black',
+            description: '',
+        };
+    }
     /**
      * The form.
      */

webapp/pages/tags/index.tsx

@@ -394 +394 @@
                     submitText="Přidat"
                     onCancel={cancelAddTagModal}
                     onSubmit={submitAddTagModal}
+                    defaultValues={{ color: selectedRecord.color }}
                 />
             )}