@sankhyalabs/sankhyablocks 10.0.21 → 10.0.22

package/dist/collection/components/snk-grid-config/snk-grid-config.js

@@ -48,31 +48,49 @@ export class SnkGridConfig {
     return newList;
   }
   createOrderList() {
+    var _a;
     let newSortableList = this.getSortableColumns();
-    newSortableList.sort((a, b) => {
-      //OS dois tem order index 0 e pelo menos um deles tem orientação de ordenação.
-      if (a.orderIndex == 0 && b.orderIndex == 0 && (a.ascending != undefined || b.ascending != undefined)) {
-        if (a.ascending != undefined)
-          return -1;
-        if (b.ascending != undefined)
-          return 1;
-        return 0;
-        //Pelo menos um deles tem order index diferente de 0 e os dois tem orientação de ordenação.
-      }
-      else if (a.ascending != undefined && b.ascending != undefined) {
+    if (((_a = this._orderPriorityList) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+      const orderedList = [];
+      this._orderPriorityList.forEach((priorityItem) => {
+        const item = newSortableList.find(col => col.label === priorityItem.label);
+        if (item) {
+          orderedList.push(item);
+        }
+      });
+      newSortableList.forEach(item => {
+        if (!orderedList.find(o => o.label === item.label)) {
+          orderedList.push(item);
+        }
+      });
+      this._orderListItems = orderedList;
+    }
+    else {
+      newSortableList.sort((a, b) => {
+        //OS dois tem order index 0 e pelo menos um deles tem orientação de ordenação.
+        if (a.orderIndex == 0 && b.orderIndex == 0 && (a.ascending != undefined || b.ascending != undefined)) {
+          if (a.ascending != undefined)
+            return -1;
+          if (b.ascending != undefined)
+            return 1;
+          return 0;
+          //Pelo menos um deles tem order index diferente de 0 e os dois tem orientação de ordenação.
+        }
+        else if (a.ascending != undefined && b.ascending != undefined) {
+          return (a.orderIndex - b.orderIndex);
+          //Pelo menos um deles tem order index diferente de 0 e pelo menos um deles tem orientação de ordenação.
+        }
+        else if (a.ascending != undefined || b.ascending != undefined) {
+          if (a.ascending != undefined)
+            return -1;
+          if (b.ascending != undefined)
+            return 1;
+          return 0;
+        }
         return (a.orderIndex - b.orderIndex);
-        //Pelo menos um deles tem order index diferente de 0 e pelo menos um deles tem orientação de ordenação.
-      }
-      else if (a.ascending != undefined || b.ascending != undefined) {
-        if (a.ascending != undefined)
-          return -1;
-        if (b.ascending != undefined)
-          return 1;
-        return 0;
-      }
-      return (a.orderIndex - b.orderIndex);
-    });
-    this._orderListItems = newSortableList;
+      });
+      this._orderListItems = newSortableList;
+    }
   }
   createColumnList() {
     const visibleGroup = this.buildVisibleGroup();
@@ -128,8 +146,11 @@ export class SnkGridConfig {
     }
     let orderArray;
     if (((_a = this._orderPriorityList) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-      this._orderPriorityList.find((item) => item.label === newItem.label).sort = sortOrder;
-      this._orderPriorityList.filter((item) => item.sort).forEach((item, index) => {
+      const priorityItem = this._orderPriorityList.find((item) => item.label === newItem.label);
+      if (priorityItem) {
+        priorityItem.sort = sortOrder.value === ORDER_VALUES.none.value ? undefined : sortOrder.value;
+      }
+      this._orderPriorityList.filter((item) => item.sort != undefined).forEach((item, index) => {
         if (item.label === newItem.label) {
           newItem.sortIndex = index;
         }
@@ -155,6 +176,7 @@ export class SnkGridConfig {
     this._dataChanged = false;
     this.closeConfig();
     this.save();
+    this._orderPriorityList = [];
   }
   updateColumns() {
     this.columns = this._columListItems.flatMap((group) => group.items.map((item) => this.buildColumnFromListItem(item, group)));
@@ -212,11 +234,8 @@ export class SnkGridConfig {
       let _newColumnConfig = _newConfig.columns.find((_newColumnConfig) => column.name === _newColumnConfig.name);
       if (column.hidden === true && _newColumnConfig)
         return;
-      if (_newColumnConfig) {
-        _newColumnConfig.width = column.width;
-      }
-      else if (column.hidden === false) {
-        _newColumnConfig = { name: column.name, width: column.width, orderIndex: 0 };
+      if (!_newColumnConfig && column.hidden === false) {
+        _newColumnConfig = { name: column.name, orderIndex: 0 };
       }
       if (_newColumnConfig) {
         if (column.sort) {
@@ -281,6 +300,7 @@ export class SnkGridConfig {
         .then((response) => {
         if (!response) {
           this._dataChanged = false;
+          this._orderPriorityList = [];
           this.configCancel.emit();
           this._componenteInternalKey = Date.now();
         }
@@ -345,6 +365,7 @@ export class SnkGridConfig {
     if (!this.resourceID)
       return;
     this._dataChanged = true;
+    this._orderPriorityList = [];
     const config = await ConfigStorage.getDefaultGridConfig(this.resourceID);
     const defaultVisibleCols = (_a = config === null || config === void 0 ? void 0 : config.columns.map(col => col.name)) !== null && _a !== void 0 ? _a : [];
     const visibleGroup = this.buildVisibleGroup();
@@ -381,7 +402,7 @@ export class SnkGridConfig {
     return (h(Host, null, h("div", { class: "grid-config__header" }, h("div", { class: "title-container" }, h("div", { class: "ez-margin-bottom--medium" }, h("label", { class: "title" }, this.getMessage('snkGridConfig.gridConfiguration')), h("label", { class: "subtitle" }, this.getMessage('snkGridConfig.columnVisibilityOrder'))), h("div", { class: "button-close" }, h("ez-button", { mode: "icon", iconName: "close", size: "medium", class: "ez-button--tertiary", onClick: () => this.closeConfig() })))), h("div", { class: 'grid-config__body' }, h("ez-collapsible-box", { id: 'group-select-columns', label: this.getMessage('snkGridConfig.columnsSelection'), "header-size": "medium", key: 'key_group-select-columns', value: this._collapsibleBoxListSelect, onEzChange: ({ detail }) => this._collapsibleBoxListOrder = !detail }, h("div", { class: "grid-config__main" }, h("ez-double-list", { leftList: this._hiddenList, leftTitle: this.getMessage('snkGridConfig.availableColumns'), rightList: this._visibleList, rightTitle: this.getMessage('snkGridConfig.selectedColumns'), onEzRightListChanged: ({ detail }) => this.handleRightListChange(detail), emptyMessage: {
         LEFT_LIST: this.getMessage('snkGridConfig.emptyMensage.left'),
         RIGHT_LIST: this.getMessage('snkGridConfig.emptyMensage.right'),
-      }, entityLabel: 'coluna', entityLabelPlural: 'colunas' }))), h("ez-collapsible-box", { id: 'ID_group-order-columns', label: this.getMessage('snkGridConfig.dataOrdering'), "header-size": "medium", key: 'KEY_group-order-columns', value: this._collapsibleBoxListOrder, onEzChange: ({ detail }) => this._collapsibleBoxListSelect = !detail }, h("div", { class: "grid-config__main" }, h("ez-double-list", { rightList: this._orderListItems, rightTitle: this.getMessage('snkGridConfig.selectedColumns'), useOnlyRightList: true, slotsListBuilder: this.getListSlots(), emptyMessage: {
+      }, entityLabel: 'coluna', entityLabelPlural: 'colunas' }))), h("ez-collapsible-box", { id: 'ID_group-order-columns', label: this.getMessage('snkGridConfig.dataOrdering'), "header-size": "medium", key: 'KEY_group-order-columns', value: this._collapsibleBoxListOrder, onEzChange: ({ detail }) => this._collapsibleBoxListSelect = !detail }, h("div", { class: "grid-config__main" }, h("ez-double-list", { rightList: this._orderListItems, rightTitle: this.getMessage('snkGridConfig.selectedColumns'), useOnlyRightList: true, slotsListBuilder: this.getListSlots(), onEzRightListChanged: (evt) => this.handleOrderListChange(evt), emptyMessage: {
         RIGHT_LIST: this.getMessage('snkGridConfig.emptyMensage.right'),
       }, entityLabel: 'coluna', entityLabelPlural: 'colunas' })))), h("div", { class: "grid-config__footer" }, this.renderResetConfigBtn(), h("ez-button", { class: "padding-right--medium", label: this.getMessage('snkGridConfig.cancel'), onClick: () => this.closeConfig() }), h("ez-button", { label: this.getMessage('snkGridConfig.complete'), class: "ez-button--primary", onClick: () => this.finish() }))));
   }