Undo the reverted changes in #4714

contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue

@@ -1,8 +1,10 @@
+
 <template>
 
   <KModal
     :title="title"
     :submitText="$tr('saveAction')"
+    :submitDisabled="!canSave"
     :cancelText="$tr('cancelAction')"
     data-test="edit-booleanMap-modal"
     @submit="handleSave"
@@ -11,6 +13,9 @@
     <p v-if="resourcesSelectedText.length > 0" data-test="resources-selected-message">
       {{ resourcesSelectedText }}
     </p>
+    <p v-if="hasMixedCategories" data-test="mixed-categories-message">
+      {{ hasMixedCategoriesMessage }}
+    </p>
     <template v-if="isDescendantsUpdatable && isTopicSelected">
       <KCheckbox
         :checked="updateDescendants"
@@ -26,9 +31,6 @@
       :inputHandler="(value) => { selectedValues = value }"
     ></slot>
 
-    <span v-if="error" class="red--text">
-      {{ error }}
-    </span>
   </KModal>
 
 </template>
@@ -45,6 +47,7 @@
   import { mapGetters, mapActions } from 'vuex';
   import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
   import { getInvalidText } from 'shared/utils/validation';
+  import commonStrings from 'shared/translator';
 
   export default {
     name: 'EditBooleanMapModal',
@@ -91,16 +94,27 @@
          */
         selectedValues: {},
         changed: false,
+        hasMixedCategories: false,
       };
     },
     computed: {
-      ...mapGetters('contentNode', ['getContentNodes']),
+      ...mapGetters('contentNode', ['getContentNodes', 'getContentNode']),
       nodes() {
         return this.getContentNodes(this.nodeIds);
       },
       isTopicSelected() {
         return this.nodes.some(node => node.kind === ContentKindsNames.TOPIC);
       },
+      canSave() {
+        if (this.hasMixedCategories) {
+          return Object.values(this.selectedValues).some(value => value.length > 0);
+        }
+        return !this.error;
+      },
+      hasMixedCategoriesMessage() {
+        // eslint-disable-next-line kolibri/vue-no-undefined-string-uses
+        return commonStrings.$tr('addAdditionalCatgoriesDescription');
+      },
     },
     watch: {
       selectedValues(newValue, oldValue) {
@@ -121,6 +135,9 @@
       });
 
       this.selectedValues = optionsNodes;
+      this.hasMixedCategories = Object.values(this.selectedValues).some(
+        value => value.length < this.nodes.length
+      );
       // reset
       this.$nextTick(() => {
         this.changed = false;
@@ -147,19 +164,20 @@
         }
       },
       async handleSave() {
-        this.validate();
-        if (this.error) {
-          return;
-        }
-
         await Promise.all(
-          this.nodes.map(node => {
+          this.nodes.map(async node => {
             const fieldValue = {};
-            Object.entries(this.selectedValues).forEach(([key, value]) => {
-              if (value.includes(node.id)) {
+            const currentNode = this.getContentNode(node.id);
+            // If we have mixed categories remain the old ones, and
+            // just add new categories if there are any
+            if (this.hasMixedCategories) {
+              Object.assign(fieldValue, currentNode[this.field] || {});
+            }
+            Object.entries(this.selectedValues)
+              .filter(([value]) => value.length === this.nodeIds.length)
+              .forEach(([key]) => {
                 fieldValue[key] = true;
-              }
-            });
+              });
             if (this.updateDescendants && node.kind === ContentKindsNames.TOPIC) {
               return this.updateContentNodeDescendants({
                 id: node.id,

contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditBooleanMapModal.spec.js

@@ -16,7 +16,6 @@ let generalActions;
 const CheckboxValue = {
   UNCHECKED: 'UNCHECKED',
   CHECKED: 'CHECKED',
-  INDETERMINATE: 'INDETERMINATE',
 };
 
 const { translateMetadataString } = metadataTranslationMixin.methods;
@@ -31,11 +30,9 @@ const getOptionsValues = wrapper => {
   const categories = {};
   const checkboxes = wrapper.findAll('[data-test="option-checkbox"]');
   checkboxes.wrappers.forEach(checkbox => {
-    const { label, checked, indeterminate } = checkbox.vm.$props || {};
+    const { label, checked } = checkbox.vm.$props || {};
     let value;
-    if (indeterminate) {
-      value = CheckboxValue.INDETERMINATE;
-    } else if (checked) {
+    if (checked) {
       value = CheckboxValue.CHECKED;
     } else {
       value = CheckboxValue.UNCHECKED;
@@ -182,26 +179,6 @@ describe('EditBooleanMapModal', () => {
         expect(dailyLifeValue).toBe(CheckboxValue.CHECKED);
         expect(foundationsValue).toBe(CheckboxValue.CHECKED);
       });
-
-      test('checkbox option should be indeterminate if not all nodes have the same options set', () => {
-        nodes['node1'].categories = {
-          [Categories.DAILY_LIFE]: true,
-          [Categories.FOUNDATIONS]: true,
-        };
-        nodes['node2'].categories = {
-          [Categories.DAILY_LIFE]: true,
-        };
-
-        const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
-
-        const optionsValues = getOptionsValues(wrapper);
-        const {
-          [Categories.DAILY_LIFE]: dailyLifeValue,
-          [Categories.FOUNDATIONS]: foundationsValue,
-        } = optionsValues;
-        expect(dailyLifeValue).toBe(CheckboxValue.CHECKED);
-        expect(foundationsValue).toBe(CheckboxValue.INDETERMINATE);
-      });
     });
   });
 

contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CategoryOptions.vue

@@ -5,7 +5,7 @@
       <template #default="{ attach, menuProps }">
         <VAutocomplete
           :value="autocompleteValues"
-          :items="autocompleteOptions"
+          :items="categoriesList"
           :searchInput.sync="categoryText"
           :label="translateMetadataString('category')"
           box
@@ -81,7 +81,6 @@
         :label="option.text"
         :style="treeItemStyle(option)"
         :checked="isSelected(option.value)"
-        :indeterminate="isCheckboxIndeterminate(option.value)"
         @change="onChange(option.value)"
       />
       <p
@@ -102,8 +101,6 @@
   import DropdownWrapper from 'shared/views/form/DropdownWrapper';
   import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins';
 
-  const MIXED = 'mixed';
-
   export default {
     name: 'CategoryOptions',
     components: { DropdownWrapper },
@@ -155,28 +152,10 @@
           this.$emit('input', value);
         },
       },
-      autocompleteOptions() {
-        const options = [...this.categoriesList];
-        if (this.expanded) {
-          // Just boolean maps can have indeterminate values
-          options.push({
-            value: MIXED,
-            text: this.$tr('mixedLabel'),
-            undeletable: true,
-          });
-        }
-        return options;
-      },
       autocompleteValues() {
         const selectedValues = Object.entries(this.selected)
           .filter(entry => entry[1].length === this.nodeIds.length)
           .map(([key]) => key);
-        if (
-          this.expanded &&
-          Object.values(this.selected).some(value => value.length < this.nodeIds.length)
-        ) {
-          selectedValues.push(MIXED);
-        }
         return selectedValues;
       },
       nested() {
@@ -216,9 +195,6 @@
         this.selected = {};
       },
       tooltipText(optionId) {
-        if (optionId === MIXED) {
-          return this.$tr('mixedLabel');
-        }
         const option = this.categoriesList.find(option => option.value === optionId);
         if (!option) {
           return '';
@@ -282,15 +258,6 @@
         });
         return nodeIds.size === this.nodeIds.length;
       },
-      isCheckboxIndeterminate(optionId) {
-        if (this.selected[optionId] && this.selected[optionId].length < this.nodeIds.length) {
-          return true;
-        }
-        return (
-          Object.keys(this.selected).some(selectedValue => selectedValue.startsWith(optionId)) &&
-          !this.isSelected(optionId)
-        );
-      },
       onChange(optionId) {
         if (this.isSelected(optionId)) {
           this.remove(optionId);
@@ -301,7 +268,6 @@
     },
     $trs: {
       noCategoryFoundText: 'Category not found',
-      mixedLabel: 'Mixed',
     },
   };
 

contentcuration/contentcuration/frontend/shared/views/form/ExpandableSelect.vue

@@ -50,7 +50,6 @@
           :key="option.value"
           :label="option.text"
           :checked="isSelected(option.value)"
-          :indeterminate="isIndeterminate(option.value)"
           data-test="option-checkbox"
           @change="value => setOption(option.value, value)"
         />
@@ -188,12 +187,6 @@
         }
         return this.valueModel[value].length === this.availableItems.length;
       },
-      isIndeterminate(value) {
-        if (!this.valueModel[value]) {
-          return false;
-        }
-        return this.valueModel[value].length < this.availableItems.length;
-      },
       setOption(optionId, value) {
         if (value) {
           this.valueModel = {
@@ -216,4 +209,4 @@
     pointer-events: none;
     opacity: 0.5;
   }
-</style>
+</style>