Don’t require tags

Author: jmgasper

src/components/ChallengeEditor/SkillsField/index.js

@@ -29,33 +29,42 @@ const SkillsField = ({ readOnly, challenge, onUpdateSkills }) => {
   const existingSkills = useMemo(() => selectedSkills.map(item => item.label).join(','), [selectedSkills])
 
   return (
-    <div className={styles.row}>
-      <div className={cn(styles.field, styles.col1)}>
-        <label htmlFor='keywords'>Skills :</label>
+    <>
+      <div className={styles.row}>
+        <div className={cn(styles.field, styles.col1)}>
+          <label htmlFor='keywords'>Skills {!readOnly && (<span>*</span>)} :</label>
+        </div>
+        <div className={cn(styles.field, styles.col2)}>
+          <input type='hidden' />
+          {readOnly ? (
+            <span>{existingSkills}</span>
+          ) : (
+            <Select
+              id='skill-select'
+              isMulti
+              simpleValue
+              isAsync
+              value={selectedSkills}
+              onChange={(values) => {
+                onUpdateSkills((values || []).map(value => ({
+                  name: value.label,
+                  id: value.value
+                })))
+              }}
+              cacheOptions
+              loadOptions={fetchSkills}
+            />
+          )}
+        </div>
       </div>
-      <div className={cn(styles.field, styles.col2)}>
-        <input type='hidden' />
-        {readOnly ? (
-          <span>{existingSkills}</span>
-        ) : (
-          <Select
-            id='skill-select'
-            isMulti
-            simpleValue
-            isAsync
-            value={selectedSkills}
-            onChange={(values) => {
-              onUpdateSkills((values || []).map(value => ({
-                name: value.label,
-                id: value.value
-              })))
-            }}
-            cacheOptions
-            loadOptions={fetchSkills}
-          />
-        )}
-      </div>
-    </div>
+
+      { !readOnly && challenge.submitTriggered && (!selectedSkills || !selectedSkills.length) && <div className={styles.row}>
+        <div className={cn(styles.field, styles.col1)} />
+        <div className={cn(styles.field, styles.col2, styles.error)}>
+          Select at least one skill
+        </div>
+      </div> }
+    </>
   )
 }
 

src/components/ChallengeEditor/TagsField/index.js

@@ -26,38 +26,29 @@ const TagsField = ({ challenge, onUpdateMultiSelect, readOnly }) => {
   }, [challenge.tags])
 
   return (
-    <>
-      <div className={styles.row}>
-        <div className={cn(styles.field, styles.col1)}>
-          <label htmlFor='keywords'>Tags{!readOnly && (<span>*</span>)} :</label>
-        </div>
-        <div className={cn(styles.field, styles.col2)}>
-          <input type='hidden' />
-          {readOnly ? (
-            <span>{existingTags}</span>
-          ) : (
-            <Select
-              id='track-select'
-              isMulti
-              simpleValue
-              value={selectedValues}
-              onChange={(value) => onUpdateMultiSelect([
-                ...(value || []),
-                ...selectedSpecialChallengeValues
-              ], 'tags')}
-              isCreatable
-            />
-          )}
-        </div>
+    <div className={styles.row}>
+      <div className={cn(styles.field, styles.col1)}>
+        <label htmlFor='keywords'>Tags{!readOnly && (<span>*</span>)} :</label>
       </div>
-
-      { !readOnly && challenge.submitTriggered && (!challenge.tags || !challenge.tags.length) && <div className={styles.row}>
-        <div className={cn(styles.field, styles.col1)} />
-        <div className={cn(styles.field, styles.col2, styles.error)}>
-          Select at least one tag
-        </div>
-      </div> }
-    </>
+      <div className={cn(styles.field, styles.col2)}>
+        <input type='hidden' />
+        {readOnly ? (
+          <span>{existingTags}</span>
+        ) : (
+          <Select
+            id='track-select'
+            isMulti
+            simpleValue
+            value={selectedValues}
+            onChange={(value) => onUpdateMultiSelect([
+              ...(value || []),
+              ...selectedSpecialChallengeValues
+            ], 'tags')}
+            isCreatable
+          />
+        )}
+      </div>
+    </div>
   )
 }
 

src/components/ChallengeEditor/index.js

@@ -794,7 +794,7 @@ class ChallengeEditor extends Component {
       'typeId',
       'name',
       'description',
-      'tags',
+      'skills',
       'prizeSets'
     ]
     let isRequiredMissing = false