From 4911816734adf3b4d64a286a7962a574d7974a82 Mon Sep 17 00:00:00 2001
From: Maksim Eltyshev <meltyshev@gmail.com>
Date: Wed, 9 Oct 2019 18:48:19 +0500
Subject: [PATCH] Allow creating label without name

---
 client/src/components/Label/Label.jsx         |  7 +++---
 client/src/components/LabelsStep/AddStep.jsx  | 13 +++--------
 client/src/components/LabelsStep/EditStep.jsx | 15 ++++---------
 client/src/components/LabelsStep/Editor.jsx   | 22 ++++---------------
 client/src/components/LabelsStep/Item.jsx     |  6 ++++-
 server/api/controllers/labels/create.js       |  5 +++--
 server/api/controllers/labels/update.js       |  5 +++--
 server/api/models/Label.js                    |  5 +++--
 .../migrations/20180722003502_create_label.js |  4 ++--
 9 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/client/src/components/Label/Label.jsx b/client/src/components/Label/Label.jsx
index 2fffba21..3de98477 100644
--- a/client/src/components/Label/Label.jsx
+++ b/client/src/components/Label/Label.jsx
@@ -48,7 +48,7 @@ const Label = React.memo(({
       className={classNames(styles.wrapper, onClick && styles.hoverable)}
       style={style}
     >
-      {name}
+      {name || '\u00A0'}
     </div>
   );
 
@@ -62,14 +62,15 @@ const Label = React.memo(({
 });
 
 Label.propTypes = {
-  name: PropTypes.string.isRequired,
-  color: PropTypes.oneOf(LabelColors.KEYS).isRequired, // TODO: without color
+  name: PropTypes.string,
+  color: PropTypes.oneOf(LabelColors.KEYS).isRequired,
   size: PropTypes.oneOf(Object.values(SIZES)),
   isDisabled: PropTypes.bool,
   onClick: PropTypes.func,
 };
 
 Label.defaultProps = {
+  name: undefined,
   size: SIZES.MEDIUM,
   isDisabled: false,
   onClick: undefined,
diff --git a/client/src/components/LabelsStep/AddStep.jsx b/client/src/components/LabelsStep/AddStep.jsx
index 8e2c26d1..c98ba7e0 100755
--- a/client/src/components/LabelsStep/AddStep.jsx
+++ b/client/src/components/LabelsStep/AddStep.jsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { Button, Form } from 'semantic-ui-react';
@@ -18,19 +18,12 @@ const AddStep = React.memo(({ onCreate, onBack }) => {
     color: LabelColors.KEYS[0],
   }));
 
-  const editor = useRef(null);
-
   const handleSubmit = useDeepCompareCallback(() => {
     const cleanData = {
       ...data,
-      name: data.name.trim(),
+      name: data.name.trim() || null,
     };
 
-    if (!cleanData.name) {
-      editor.current.selectNameField();
-      return;
-    }
-
     onCreate(cleanData);
     onBack();
   }, [data, onCreate, onBack]);
@@ -44,7 +37,7 @@ const AddStep = React.memo(({ onCreate, onBack }) => {
       </Popup.Header>
       <Popup.Content>
         <Form onSubmit={handleSubmit}>
-          <Editor ref={editor} data={data} onFieldChange={handleFieldChange} />
+          <Editor data={data} onFieldChange={handleFieldChange} />
           <Button positive content={t('action.createLabel')} className={styles.submitButton} />
         </Form>
       </Popup.Content>
diff --git a/client/src/components/LabelsStep/EditStep.jsx b/client/src/components/LabelsStep/EditStep.jsx
index 7dce7fe3..b288672f 100755
--- a/client/src/components/LabelsStep/EditStep.jsx
+++ b/client/src/components/LabelsStep/EditStep.jsx
@@ -1,5 +1,5 @@
 import dequal from 'dequal';
-import React, { useCallback, useRef } from 'react';
+import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { Button, Form } from 'semantic-ui-react';
@@ -22,26 +22,19 @@ const EditStep = React.memo(({
   const [t] = useTranslation();
 
   const [data, handleFieldChange] = useForm(() => ({
-    name: '',
     color: LabelColors.KEYS[0],
     ...defaultData,
+    name: defaultData.name || '',
   }));
 
   const [step, openStep, handleBack] = useSteps();
 
-  const editor = useRef(null);
-
   const handleSubmit = useDeepCompareCallback(() => {
     const cleanData = {
       ...data,
-      name: data.name.trim(),
+      name: data.name.trim() || null,
     };
 
-    if (!cleanData.name) {
-      editor.current.selectNameField();
-      return;
-    }
-
     if (!dequal(cleanData, defaultData)) {
       onUpdate(cleanData);
     }
@@ -76,7 +69,7 @@ const EditStep = React.memo(({
       </Popup.Header>
       <Popup.Content>
         <Form onSubmit={handleSubmit}>
-          <Editor ref={editor} data={data} onFieldChange={handleFieldChange} />
+          <Editor data={data} onFieldChange={handleFieldChange} />
           <Button positive content={t('action.save')} />
         </Form>
         <Button
diff --git a/client/src/components/LabelsStep/Editor.jsx b/client/src/components/LabelsStep/Editor.jsx
index fda06c54..d76a7813 100755
--- a/client/src/components/LabelsStep/Editor.jsx
+++ b/client/src/components/LabelsStep/Editor.jsx
@@ -1,6 +1,4 @@
-import React, {
-  useCallback, useEffect, useImperativeHandle, useRef,
-} from 'react';
+import React, { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
@@ -11,27 +9,15 @@ import LabelColors from '../../constants/LabelColors';
 
 import styles from './Editor.module.css';
 
-const Editor = React.forwardRef(({ data, onFieldChange }, ref) => {
+const Editor = React.memo(({ data, onFieldChange }) => {
   const [t] = useTranslation();
 
   const nameField = useRef(null);
 
-  const selectNameField = useCallback(() => {
+  useEffect(() => {
     nameField.current.select();
   }, []);
 
-  useImperativeHandle(
-    ref,
-    () => ({
-      selectNameField,
-    }),
-    [selectNameField],
-  );
-
-  useEffect(() => {
-    selectNameField();
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
   return (
     <>
       <div className={styles.text}>{t('common.title')}</div>
@@ -71,4 +57,4 @@ Editor.propTypes = {
   onFieldChange: PropTypes.func.isRequired,
 };
 
-export default React.memo(Editor);
+export default Editor;
diff --git a/client/src/components/LabelsStep/Item.jsx b/client/src/components/LabelsStep/Item.jsx
index 1adf02d7..b1ea3c4a 100755
--- a/client/src/components/LabelsStep/Item.jsx
+++ b/client/src/components/LabelsStep/Item.jsx
@@ -43,7 +43,7 @@ const Item = React.memo(({
 });
 
 Item.propTypes = {
-  name: PropTypes.string.isRequired,
+  name: PropTypes.string,
   color: PropTypes.string.isRequired,
   isPersisted: PropTypes.bool.isRequired,
   isActive: PropTypes.bool.isRequired,
@@ -52,4 +52,8 @@ Item.propTypes = {
   onEdit: PropTypes.func.isRequired,
 };
 
+Item.defaultProps = {
+  name: undefined,
+};
+
 export default Item;
diff --git a/server/api/controllers/labels/create.js b/server/api/controllers/labels/create.js
index b4d8aab9..fa5bcfab 100755
--- a/server/api/controllers/labels/create.js
+++ b/server/api/controllers/labels/create.js
@@ -12,12 +12,13 @@ module.exports = {
     },
     name: {
       type: 'string',
-      required: true
+      isNotEmptyString: true,
+      allowNull: true
     },
     color: {
       type: 'string',
       isIn: Label.COLORS,
-      allowNull: true
+      required: true
     }
   },
 
diff --git a/server/api/controllers/labels/update.js b/server/api/controllers/labels/update.js
index 1dfae2f4..e046199d 100755
--- a/server/api/controllers/labels/update.js
+++ b/server/api/controllers/labels/update.js
@@ -12,12 +12,13 @@ module.exports = {
     },
     name: {
       type: 'string',
-      isNotEmptyString: true
+      isNotEmptyString: true,
+      allowNull: true
     },
     color: {
       type: 'string',
       isIn: Label.COLORS,
-      allowNull: true
+      required: true
     }
   },
 
diff --git a/server/api/models/Label.js b/server/api/models/Label.js
index 045e4d72..fb162b4b 100755
--- a/server/api/models/Label.js
+++ b/server/api/models/Label.js
@@ -28,12 +28,13 @@ module.exports = {
 
     name: {
       type: 'string',
-      required: true
+      isNotEmptyString: true,
+      allowNull: true
     },
     color: {
       type: 'string',
       isIn: COLORS,
-      allowNull: true
+      required: true
     },
 
     //  ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
diff --git a/server/db/migrations/20180722003502_create_label.js b/server/db/migrations/20180722003502_create_label.js
index d0545d66..948a25a5 100755
--- a/server/db/migrations/20180722003502_create_label.js
+++ b/server/db/migrations/20180722003502_create_label.js
@@ -6,8 +6,8 @@ module.exports.up = knex =>
 
     table.integer('board_id').notNullable();
 
-    table.text('name').notNullable();
-    table.text('color');
+    table.text('name');
+    table.text('color').notNullable();
 
     table.timestamp('created_at', true);
     table.timestamp('updated_at', true);