Concepts page

src/App.vue

@@ -775,6 +775,31 @@ h2 {
   color: $blue;
 }
 
+.tags {
+  .tag {
+    background: var(--background-tag);
+    color: var(--text);
+
+    a {
+      color: var(--text);
+    }
+
+    .action {
+      cursor: pointer;
+      background: $light-grey;
+      color: white;
+
+      .dark & {
+        background: $dark-grey;
+      }
+
+      &:hover {
+        background: $dark-grey-lighter;
+      }
+    }
+  }
+}
+
 .timecode {
   border: 1px solid $blue;
   border-radius: 5px;

src/components/lists/TaskStatusList.vue

@@ -28,6 +28,9 @@
             <th scope="col" class="is-feedback-request">
               {{ $t('task_status.fields.is_feedback_request') }}
             </th>
+            <th scope="col" class="is-concept">
+              {{ $t('task_status.fields.for_concept') }}
+            </th>
             <th scope="col" class="actions"></th>
           </tr>
         </thead>
@@ -52,6 +55,7 @@
               class="is-feedback-request"
               :value="entry.is_feedback_request"
             />
+            <boolean-cell class="is-concept" :value="entry.for_concept" />
             <row-actions-cell
               :entry-id="entry.id"
               :hide-delete="entry.is_default === true"
@@ -138,7 +142,8 @@ export default {
 .is-retake,
 .is-artist-allowed,
 .is-client-allowed,
-.is-feedback-request {
+.is-feedback-request,
+.is-concept {
   text-align: center;
   width: 140px;
   min-width: 140px;

src/components/lists/TaskTypeList.vue

@@ -251,8 +251,9 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from 'vuex'
+import { mapGetters } from 'vuex'
 import draggable from 'vuedraggable'
+
 import BooleanRep from '@/components/widgets/BooleanRep'
 import DepartmentName from '@/components/widgets/DepartmentName.vue'
 import RowActionsCell from '@/components/cells/RowActionsCell'
@@ -296,8 +297,6 @@ export default {
     TaskTypeCell
   },
 
-  mounted() {},
-
   computed: {
     ...mapGetters(['getDepartments']),
 
@@ -323,8 +322,6 @@ export default {
   },
 
   methods: {
-    ...mapActions([]),
-
     getTaskTypesForEntity(entity) {
       return this.entries.filter(taskType => taskType.for_entity === entity)
     },

src/components/modals/AddPreviewModal.vue

@@ -15,7 +15,7 @@
           {{ $t('tasks.change_preview') }}
         </h1>
         <h1 class="title" v-else>
-          {{ $t('tasks.add_preview') }}
+          {{ isConcept ? $t('concepts.add_concept') : $t('tasks.add_preview') }}
         </h1>
 
         <p>
@@ -25,15 +25,19 @@
         <file-upload
           ref="preview-field"
           :accept="extensions"
-          :multiple="true"
+          :multiple="isMultiple"
           :label="$t('main.select_file')"
           :is-primary="false"
           @fileselected="onFileSelected"
           hide-file-names
         />
 
         <p class="error" v-if="isError">
-          {{ $t('tasks.add_preview_error') }}
+          {{
+            isConcept
+              ? $t('concepts.add_concept_error')
+              : $t('tasks.add_preview_error')
+          }}
         </p>
 
         <h3 class="subtitle has-text-centered" v-if="forms.length > 0">
@@ -73,9 +77,9 @@
           </template>
         </p>
 
-        <div class="mt1 message">
+        <div class="mt1 message" v-if="message">
           <div class="message-body">
-            {{ $t('tasks.revision_preview_file') }}
+            {{ $t(message) }}
           </div>
         </div>
 
@@ -89,7 +93,11 @@
             }"
             @click="$emit('confirm', forms)"
           >
-            {{ $t('tasks.add_revision_confirm') }}
+            {{
+              isConcept
+                ? $t('main.confirmation')
+                : $t('tasks.add_revision_confirm')
+            }}
           </a>
           <button @click="$emit('cancel')" class="button is-link">
             {{ $t('main.cancel') }}
@@ -119,22 +127,34 @@ export default {
       type: Boolean,
       default: false
     },
-    isLoading: {
+    isConcept: {
+      type: Boolean,
+      default: false
+    },
+    isEditing: {
       type: Boolean,
       default: false
     },
     isError: {
       type: Boolean,
       default: false
     },
-    isEditing: {
+    isLoading: {
       type: Boolean,
       default: false
     },
+    isMultiple: {
+      type: Boolean,
+      default: true
+    },
     extensions: {
       type: String,
       default: files.ALL_EXTENSIONS_STRING
     },
+    message: {
+      type: String,
+      default: 'tasks.revision_preview_file'
+    },
     title: {
       type: String,
       default: ''
@@ -159,7 +179,7 @@ export default {
     ...mapActions([]),
 
     onFileSelected(forms) {
-      this.forms = this.forms.concat(forms)
+      this.forms = this.isMultiple ? this.forms.concat(forms) : [forms]
       this.$emit('fileselected', this.forms)
     },
 

src/components/modals/EditCommentModal.vue

@@ -14,9 +14,9 @@
         </h1>
 
         <form @submit.prevent>
-          <combo-box-status
+          <combobox-status
             :label="$t('task_status.title')"
-            :task-status-list="taskStatusForCurrentUser"
+            :task-status-list="taskStatuses"
             v-model="form.task_status_id"
           />
 
@@ -157,7 +157,7 @@ import { XIcon } from 'vue-feather-icons'
 
 import AtTa from 'vue-at/dist/vue-at-textarea'
 import Checklist from '@/components/widgets/Checklist'
-import ComboBoxStatus from '@/components/widgets/ComboboxStatus.vue'
+import ComboboxStatus from '@/components/widgets/ComboboxStatus.vue'
 import FileUpload from '@/components/widgets/FileUpload'
 import ModalFooter from '@/components/modals/ModalFooter'
 import PeopleAvatar from '@/components/widgets/PeopleAvatar'
@@ -168,7 +168,7 @@ export default {
   components: {
     AtTa,
     Checklist,
-    ComboBoxStatus,
+    ComboboxStatus,
     FileUpload,
     ModalFooter,
     PeopleAvatar,
@@ -228,7 +228,17 @@ export default {
       'isCurrentUserClient',
       'productionDepartmentIds',
       'taskStatusForCurrentUser'
-    ])
+    ]),
+
+    taskStatuses() {
+      return this.taskStatusForCurrentUser.filter(
+        status => Boolean(status.for_concept) === this.isConceptTask
+      )
+    },
+
+    isConceptTask() {
+      return this.$route.path.includes('concept')
+    }
   },
 
   methods: {

src/components/modals/EditTaskStatusModal.vue

@@ -69,6 +69,12 @@
             v-model="form.is_feedback_request"
             v-if="form.is_default === 'false'"
           />
+          <boolean-field
+            :label="$t('task_status.fields.for_concept')"
+            @enter="confirmClicked"
+            v-model="form.for_concept"
+            v-if="form.is_default === 'false'"
+          />
 
           <color-field
             ref="colorField"
@@ -218,6 +224,7 @@ export default {
           is_feedback_request: String(
             this.taskStatusToEdit.is_feedback_request || false
           ),
+          for_concept: String(this.taskStatusToEdit.for_concept || false),
           archived: String(this.taskStatusToEdit.archived || false)
         }
       }