@zeedhi/teknisa-components-vuetify 1.58.0 → 1.59.0

package/dist/tek-components-vuetify.esm.js

@@ -1,9 +1,9 @@
-import { ModalService, Icons } from '@zeedhi/common';
+import { ModalService, IterableComponentRender, Icons } from '@zeedhi/common';
 import { ZdUserInfo } from '@zeedhi/zd-user-info-vue';
 import { Metadata, Config, dayjs, Singleton, Utils, I18n, Loader, VersionService } from '@zeedhi/core';
 import { Prop, Component, Watch } from 'vue-property-decorator';
-import { BreadcrumbHeader, CardTitle, CrudButton, CrudAddButton, CrudCancelButton, CrudDeleteButton, CrudForm, CrudSaveButton, TekGrid as TekGrid$2, TekRestDatasource, TekMemoryDatasource, TekGridColumn, TekGridColumnsButton as TekGridColumnsButton$1, TekGridLayoutOptions as TekGridLayoutOptions$1, TekFilterHelper, Image, IterableCarousel, IterableComponentRender, Loading, Notifications, ProductCard, TekTreeGrid, TekUserInfo as TekUserInfo$1, TekUserInfoList as TekUserInfoList$1 } from '@zeedhi/teknisa-components-common';
-import { PropWatch, ZdComponent, ZdComponentRender, components as components$1, ZdForm, ZdGrid, ZdIterableColumnsButton, ZdIterable, ZdLoading } from '@zeedhi/vuetify';
+import { BreadcrumbHeader, CardTitle, CrudButton, CrudAddButton, CrudCancelButton, CrudDeleteButton, CrudForm, CrudSaveButton, TekGrid as TekGrid$2, TekRestDatasource, TekMemoryDatasource, TekGridColumn, TekGridColumnsButton as TekGridColumnsButton$1, TekGridLayoutOptions as TekGridLayoutOptions$1, TekFilterHelper, Image, IterableCarousel, Loading, Notifications, ProductCard, TekTreeGrid, TekUserInfo as TekUserInfo$1, TekUserInfoList as TekUserInfoList$1 } from '@zeedhi/teknisa-components-common';
+import { PropWatch, ZdComponent, ZdComponentRender, components as components$1, ZdForm, ZdGrid, ZdIterableColumnsButton, ZdIterableComponentRender, ZdLoading, ZdIterable } from '@zeedhi/vuetify';
 import debounce from 'lodash.debounce';
 import Sortable from 'sortablejs';
 import cloneDeep from 'lodash.clonedeep';
@@ -4525,19 +4525,39 @@ let TekGridLayoutOptions = class TekGridLayoutOptions extends ZdComponentRender
         return {};
     }
     applyLayout(layout) {
+        var _a;
         let groupParamsChanged = false;
         const tableElement = this.getParentTable();
         if (!tableElement)
             return;
         const { grid } = this.instance;
         const gridColumns = {};
+        let layoutChanged = false;
+        const gridColumnNames = [];
         grid.columns.forEach((column) => {
+            var _a, _b;
             gridColumns[column.name] = column;
+            gridColumnNames.push(column.name);
+            const layoutHasCol = (_a = layout === null || layout === void 0 ? void 0 : layout.columns) === null || _a === void 0 ? void 0 : _a.find((layCol) => layCol.name === column.name);
+            // if column doesnt exist in the layout, push it
+            if (layout && !layoutHasCol) {
+                layoutChanged = true;
+                (_b = layout.columns) === null || _b === void 0 ? void 0 : _b.push(column);
+            }
         });
         const oldOrder = JSON.stringify(grid.datasource.order);
         const oldFilter = JSON.stringify(grid.datasource.filter);
         const oldDynamicFilter = JSON.stringify(this.datasourceDynamicFilter(grid.datasource));
         if (layout) {
+            // removes columns that are in the layout but not in grid
+            layout.columns = (_a = layout.columns) === null || _a === void 0 ? void 0 : _a.filter((column) => {
+                const isInGrid = gridColumnNames.includes(column.name);
+                if (!isInGrid)
+                    layoutChanged = true;
+                return isInGrid;
+            });
+            if (layoutChanged)
+                this.instance.updateLayout(layout.name, this.getCurrentLayout(layout.name));
             tableElement.style.width = layout.gridWidth || 'auto';
             grid.datasource.order = layout.order !== undefined ? layout.order : grid.datasource.order;
             grid.datasource.filter = layout.filter !== undefined ? layout.filter : grid.datasource.filter;
@@ -5195,64 +5215,14 @@ __vue_render__$7._withStripped = true;
   );
 
 /**
- * TekIterableComponentRender component
+ * ZdIterableComponentRender component
  */
-let TekIterableComponentRender = class TekIterableComponentRender extends ZdIterable {
+let TekIterableComponentRender = class TekIterableComponentRender extends ZdIterableComponentRender {
     constructor() {
         super(...arguments);
         this.instanceType = IterableComponentRender;
     }
 };
-__decorate([
-    Prop({ type: Array, default: () => [] })
-], TekIterableComponentRender.prototype, "footerSlot", void 0);
-__decorate([
-    Prop({ type: Array, default: () => [] })
-], TekIterableComponentRender.prototype, "toolbarSlot", void 0);
-__decorate([
-    Prop({ type: [Object, String] })
-], TekIterableComponentRender.prototype, "componentMetadata", void 0);
-__decorate([
-    PropWatch({ type: String, default: 'row' })
-], TekIterableComponentRender.prototype, "rowPropName", void 0);
-__decorate([
-    Prop({ type: Array, default: () => ([]) })
-], TekIterableComponentRender.prototype, "errorSlot", void 0);
-__decorate([
-    Prop({
-        type: Array,
-        default: () => ([
-            {
-                name: '<<NAME>>_no-data',
-                component: 'ZdText',
-                cssClass: 'no-data',
-                text: 'NO_DATA',
-            },
-        ]),
-    })
-], TekIterableComponentRender.prototype, "noDataSlot", void 0);
-__decorate([
-    Prop({
-        type: Array,
-        default: () => ([
-            {
-                name: '<<NAME>>_no-result',
-                component: 'ZdText',
-                cssClass: 'no-result',
-                text: 'NO_RESULT',
-            },
-        ]),
-    })
-], TekIterableComponentRender.prototype, "noResultSlot", void 0);
-__decorate([
-    PropWatch({ type: [Number, String], default: 'auto' })
-], TekIterableComponentRender.prototype, "height", void 0);
-__decorate([
-    PropWatch({ type: [Number, String], default: 'none' })
-], TekIterableComponentRender.prototype, "maxHeight", void 0);
-__decorate([
-    PropWatch({ type: [Number, String], default: 'none' })
-], TekIterableComponentRender.prototype, "minHeight", void 0);
 TekIterableComponentRender = __decorate([
     Component
 ], TekIterableComponentRender);

package/dist/tek-components-vuetify.umd.js

@@ -4527,19 +4527,39 @@
             return {};
         }
         applyLayout(layout) {
+            var _a;
             let groupParamsChanged = false;
             const tableElement = this.getParentTable();
             if (!tableElement)
                 return;
             const { grid } = this.instance;
             const gridColumns = {};
+            let layoutChanged = false;
+            const gridColumnNames = [];
             grid.columns.forEach((column) => {
+                var _a, _b;
                 gridColumns[column.name] = column;
+                gridColumnNames.push(column.name);
+                const layoutHasCol = (_a = layout === null || layout === void 0 ? void 0 : layout.columns) === null || _a === void 0 ? void 0 : _a.find((layCol) => layCol.name === column.name);
+                // if column doesnt exist in the layout, push it
+                if (layout && !layoutHasCol) {
+                    layoutChanged = true;
+                    (_b = layout.columns) === null || _b === void 0 ? void 0 : _b.push(column);
+                }
             });
             const oldOrder = JSON.stringify(grid.datasource.order);
             const oldFilter = JSON.stringify(grid.datasource.filter);
             const oldDynamicFilter = JSON.stringify(this.datasourceDynamicFilter(grid.datasource));
             if (layout) {
+                // removes columns that are in the layout but not in grid
+                layout.columns = (_a = layout.columns) === null || _a === void 0 ? void 0 : _a.filter((column) => {
+                    const isInGrid = gridColumnNames.includes(column.name);
+                    if (!isInGrid)
+                        layoutChanged = true;
+                    return isInGrid;
+                });
+                if (layoutChanged)
+                    this.instance.updateLayout(layout.name, this.getCurrentLayout(layout.name));
                 tableElement.style.width = layout.gridWidth || 'auto';
                 grid.datasource.order = layout.order !== undefined ? layout.order : grid.datasource.order;
                 grid.datasource.filter = layout.filter !== undefined ? layout.filter : grid.datasource.filter;
@@ -5197,64 +5217,14 @@
       );
 
     /**
-     * TekIterableComponentRender component
+     * ZdIterableComponentRender component
      */
-    let TekIterableComponentRender = class TekIterableComponentRender extends vuetify.ZdIterable {
+    let TekIterableComponentRender = class TekIterableComponentRender extends vuetify.ZdIterableComponentRender {
         constructor() {
             super(...arguments);
-            this.instanceType = teknisaComponentsCommon.IterableComponentRender;
+            this.instanceType = common.IterableComponentRender;
         }
     };
-    __decorate([
-        vuePropertyDecorator.Prop({ type: Array, default: () => [] })
-    ], TekIterableComponentRender.prototype, "footerSlot", void 0);
-    __decorate([
-        vuePropertyDecorator.Prop({ type: Array, default: () => [] })
-    ], TekIterableComponentRender.prototype, "toolbarSlot", void 0);
-    __decorate([
-        vuePropertyDecorator.Prop({ type: [Object, String] })
-    ], TekIterableComponentRender.prototype, "componentMetadata", void 0);
-    __decorate([
-        vuetify.PropWatch({ type: String, default: 'row' })
-    ], TekIterableComponentRender.prototype, "rowPropName", void 0);
-    __decorate([
-        vuePropertyDecorator.Prop({ type: Array, default: () => ([]) })
-    ], TekIterableComponentRender.prototype, "errorSlot", void 0);
-    __decorate([
-        vuePropertyDecorator.Prop({
-            type: Array,
-            default: () => ([
-                {
-                    name: '<<NAME>>_no-data',
-                    component: 'ZdText',
-                    cssClass: 'no-data',
-                    text: 'NO_DATA',
-                },
-            ]),
-        })
-    ], TekIterableComponentRender.prototype, "noDataSlot", void 0);
-    __decorate([
-        vuePropertyDecorator.Prop({
-            type: Array,
-            default: () => ([
-                {
-                    name: '<<NAME>>_no-result',
-                    component: 'ZdText',
-                    cssClass: 'no-result',
-                    text: 'NO_RESULT',
-                },
-            ]),
-        })
-    ], TekIterableComponentRender.prototype, "noResultSlot", void 0);
-    __decorate([
-        vuetify.PropWatch({ type: [Number, String], default: 'auto' })
-    ], TekIterableComponentRender.prototype, "height", void 0);
-    __decorate([
-        vuetify.PropWatch({ type: [Number, String], default: 'none' })
-    ], TekIterableComponentRender.prototype, "maxHeight", void 0);
-    __decorate([
-        vuetify.PropWatch({ type: [Number, String], default: 'none' })
-    ], TekIterableComponentRender.prototype, "minHeight", void 0);
     TekIterableComponentRender = __decorate([
         vuePropertyDecorator.Component
     ], TekIterableComponentRender);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-components-vuetify",
-  "version": "1.58.0",
+  "version": "1.59.0",
   "description": "Teknisa Components based on Vuetify",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -18,10 +18,6 @@
     "watch": "rollup -cw"
   },
   "dependencies": {
-    "@types/lodash.clonedeep": "^4.5.6",
-    "@types/lodash.debounce": "^4.0.6",
-    "@types/lodash.merge": "^4.6.6",
-    "@types/sortablejs": "^1.10.6",
     "@zeedhi/zd-user-info-common": "^1.0.2",
     "@zeedhi/zd-user-info-vue": "^1.0.2",
     "lodash.clonedeep": "^4.5.0",
@@ -33,6 +29,10 @@
   },
   "devDependencies": {
     "@types/jest": "^26.0.19",
+    "@types/lodash.clonedeep": "^4.5.6",
+    "@types/lodash.debounce": "^4.0.6",
+    "@types/lodash.merge": "^4.6.6",
+    "@types/sortablejs": "^1.10.6",
     "@vue/test-utils": "^1.1.2",
     "ts-jest": "^26.4.4"
   },
@@ -41,5 +41,5 @@
     "vue": "^2.6.12",
     "vuetify": "^2.4.0"
   },
-  "gitHead": "708b51c2be642855478411bf14293b8049bc1b56"
+  "gitHead": "4921b26650ab33735fee16dea49989a5a0439207"
 }

package/types/components/tek-iterable-component-render/TekIterableComponentRender.d.ts

@@ -1,20 +1,9 @@
-import { ZdIterable } from '@zeedhi/vuetify';
-import { IComponentRender } from '@zeedhi/common';
-import { IterableComponentRender } from '@zeedhi/teknisa-components-common';
+import { ZdIterableComponentRender } from '@zeedhi/vuetify';
+import { IterableComponentRender } from '@zeedhi/common';
 /**
- * TekIterableComponentRender component
+ * ZdIterableComponentRender component
  */
-export default class TekIterableComponentRender extends ZdIterable {
-    footerSlot: IComponentRender[];
-    toolbarSlot: IComponentRender[];
-    componentMetadata: IComponentRender;
-    rowPropName: string;
-    errorSlot: IComponentRender[];
-    noDataSlot: IComponentRender[];
-    noResultSlot: IComponentRender[];
-    height: number | string;
-    maxHeight: number | string;
-    minHeight: number | string;
+export default class TekIterableComponentRender extends ZdIterableComponentRender {
     instance: IterableComponentRender;
     instanceType: typeof IterableComponentRender;
 }