@zeedhi/common 1.129.0 → 1.130.0

package/dist/zd-common.esm.js

@@ -1,4 +1,4 @@
-import { AccessorManager, Event, KeyMap, MethodNotAssignedError, Metadata, Accessor, I18n, FormatterParserProvider, Validation, Mask, DatasourceFactory, Loader, Config, dayjs, Utils, DateHelper, Router, Messages, InstanceNotFoundError, ViewService, URL as URL$1, Http, Cookie, VersionService } from '@zeedhi/core';
+import { AccessorManager, Event, KeyMap, MethodNotAssignedError, Metadata, Accessor, I18n, FormatterParserProvider, Validation, Mask, DatasourceFactory, Loader, Config, dayjs, Utils, DateHelper, Router, Messages, InstanceNotFoundError, ViewService, URL, Http, Cookie, VersionService } from '@zeedhi/core';
 import merge from 'lodash.merge';
 import cloneDeep from 'lodash.clonedeep';
 import debounce from 'lodash.debounce';
@@ -8124,6 +8124,97 @@ class IterablePageComponent extends ComponentRender {
     }
 }
 
+class DataValueOutHelper {
+    static getFormParent(select) {
+        let { formParent } = select;
+        if (select.dataValueOutFormName) {
+            try {
+                formParent = Metadata.getInstance(select.dataValueOutFormName);
+            }
+            catch (error) {
+                // instance not found, use input.formParent
+            }
+        }
+        return formParent;
+    }
+    static setDataValueOut(select, value) {
+        const { dataValueOut } = select;
+        if (dataValueOut && dataValueOut.length && typeof value === 'object') {
+            const formParent = DataValueOutHelper.getFormParent(select);
+            if (formParent) {
+                dataValueOut.forEach((columns) => {
+                    const { column, columnOnForm } = columns;
+                    if (!column || !columnOnForm)
+                        return;
+                    const currentValue = value ? value[column] : null;
+                    if (!Utils.isEqual(formParent.value[columnOnForm], currentValue)) {
+                        formParent.value[columnOnForm] = currentValue;
+                    }
+                });
+            }
+        }
+    }
+}
+
+class DatasourceSearcher {
+    constructor() {
+        this.dsSearch = {
+            SEARCH: (value, searchIn) => ({
+                searchIn: [searchIn],
+                search: String(value || ''),
+            }),
+            FILTER: (value, searchIn) => ({
+                filter: {
+                    [searchIn]: value,
+                },
+            }),
+            FIND: (value, searchIn) => ({
+                find: {
+                    [searchIn]: value,
+                },
+            }),
+            DYNAMIC_FILTER: (value, search_in) => {
+                const arrayValue = Array.isArray(value) ? value : Array.of(value);
+                const filter = arrayValue.map((item) => ({ operation: 'EQUALS', relation: 'OR', value: item }));
+                const dynamicFilter = { [search_in]: filter };
+                return { dynamicFilter };
+            },
+        };
+    }
+    search(datasource, searchValue, searchIn, searchParam) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // using filter/find/dynamicFilter should make only 1 request
+            // using normal search should make one request per search value
+            if (!Array.isArray(searchValue)) {
+                return this.searchRequest(datasource, searchValue, searchIn, searchParam);
+            }
+            if (searchParam !== 'SEARCH') {
+                const items = yield this.searchRequest(datasource, searchValue, searchIn, searchParam);
+                return items;
+            }
+            const searchedItems = [];
+            const promises = searchValue.map((value) => __awaiter(this, void 0, void 0, function* () {
+                const [item] = yield this.searchRequest(datasource, value, searchIn, searchParam);
+                searchedItems.push(item);
+            }));
+            yield Promise.all(promises);
+            return searchedItems;
+        });
+    }
+    searchRequest(datasource, searchValue, searchIn, searchParam) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = Object.assign(Object.assign(Object.assign({}, datasource.clone()), this.dsSearch[searchParam](searchValue, searchIn)), { lazyLoad: true, loadAll: Array.isArray(searchValue) });
+            const cloneDatasource = DatasourceFactory.factory(config);
+            const items = yield cloneDatasource.get();
+            cloneDatasource.destroy();
+            if (Array.isArray(searchValue)) {
+                return items.filter((item) => searchValue.includes(item[searchIn]));
+            }
+            return items.filter((row) => row[searchIn] === searchValue);
+        });
+    }
+}
+
 class Icons {
     /**
      * Replace all the icons
@@ -8469,10 +8560,10 @@ class WatchURL {
         const query = Router.getQuery();
         if (!(query[param] == null && value == null) && query[param] !== value) {
             if (value || typeof value === 'number') {
-                URL$1.updateQueryString({ [param]: value }, replace);
+                URL.updateQueryString({ [param]: value }, replace);
             }
             else {
-                URL$1.deleteQueryParam(param, replace);
+                URL.deleteQueryParam(param, replace);
             }
         }
     }
@@ -9347,6 +9438,8 @@ class EmptyDataError extends Error {
     }
 }
 
+const combineURLs = (baseURL, relativeURL) => (`${baseURL.replace(/\/?$/, '')}/${relativeURL.replace(/^\/+/, '')}`);
+
 class Report {
     constructor(iterable, title) {
         this.endPoint = Config.reportsEndPoint;
@@ -9467,14 +9560,14 @@ class Report {
                 filter: JSON.stringify(row.filter),
                 metaData: JSON.stringify(row.metaData),
             };
-            const url = new URL(route, this.endPoint).href;
+            const url = combineURLs(this.endPoint, route);
             const response = yield Http.post(url, {
                 origin,
                 requestType: 'Row',
                 row,
             });
             const reportFile = response.data.messages[0].message;
-            return new URL(reportFile, this.fileEndPoint).href;
+            return combineURLs(this.fileEndPoint, reportFile);
         });
     }
 }
@@ -9906,97 +9999,6 @@ class TreeDataStructure {
     }
 }
 
-class DataValueOutHelper {
-    static getFormParent(select) {
-        let { formParent } = select;
-        if (select.dataValueOutFormName) {
-            try {
-                formParent = Metadata.getInstance(select.dataValueOutFormName);
-            }
-            catch (error) {
-                // instance not found, use input.formParent
-            }
-        }
-        return formParent;
-    }
-    static setDataValueOut(select, value) {
-        const { dataValueOut } = select;
-        if (dataValueOut && dataValueOut.length && typeof value === 'object') {
-            const formParent = DataValueOutHelper.getFormParent(select);
-            if (formParent) {
-                dataValueOut.forEach((columns) => {
-                    const { column, columnOnForm } = columns;
-                    if (!column || !columnOnForm)
-                        return;
-                    const currentValue = value ? value[column] : null;
-                    if (!Utils.isEqual(formParent.value[columnOnForm], currentValue)) {
-                        formParent.value[columnOnForm] = currentValue;
-                    }
-                });
-            }
-        }
-    }
-}
-
-class DatasourceSearcher {
-    constructor() {
-        this.dsSearch = {
-            SEARCH: (value, searchIn) => ({
-                searchIn: [searchIn],
-                search: String(value || ''),
-            }),
-            FILTER: (value, searchIn) => ({
-                filter: {
-                    [searchIn]: value,
-                },
-            }),
-            FIND: (value, searchIn) => ({
-                find: {
-                    [searchIn]: value,
-                },
-            }),
-            DYNAMIC_FILTER: (value, search_in) => {
-                const arrayValue = Array.isArray(value) ? value : Array.of(value);
-                const filter = arrayValue.map((item) => ({ operation: 'EQUALS', relation: 'OR', value: item }));
-                const dynamicFilter = { [search_in]: filter };
-                return { dynamicFilter };
-            },
-        };
-    }
-    search(datasource, searchValue, searchIn, searchParam) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // using filter/find/dynamicFilter should make only 1 request
-            // using normal search should make one request per search value
-            if (!Array.isArray(searchValue)) {
-                return this.searchRequest(datasource, searchValue, searchIn, searchParam);
-            }
-            if (searchParam !== 'SEARCH') {
-                const items = yield this.searchRequest(datasource, searchValue, searchIn, searchParam);
-                return items;
-            }
-            const searchedItems = [];
-            const promises = searchValue.map((value) => __awaiter(this, void 0, void 0, function* () {
-                const [item] = yield this.searchRequest(datasource, value, searchIn, searchParam);
-                searchedItems.push(item);
-            }));
-            yield Promise.all(promises);
-            return searchedItems;
-        });
-    }
-    searchRequest(datasource, searchValue, searchIn, searchParam) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = Object.assign(Object.assign(Object.assign({}, datasource.clone()), this.dsSearch[searchParam](searchValue, searchIn)), { lazyLoad: true, loadAll: Array.isArray(searchValue) });
-            const cloneDatasource = DatasourceFactory.factory(config);
-            const items = yield cloneDatasource.get();
-            cloneDatasource.destroy();
-            if (Array.isArray(searchValue)) {
-                return items.filter((item) => searchValue.includes(item[searchIn]));
-            }
-            return items.filter((row) => row[searchIn] === searchValue);
-        });
-    }
-}
-
 const uniqueBy = (a, key) => {
     const seen = {};
     return a.filter((item) => {
@@ -15071,11 +15073,12 @@ class Tree extends ComponentRender {
         this.minWidth = this.getInitValue('minWidth', props.minWidth, this.minWidth);
         this.maxWidth = this.getInitValue('maxWidth', props.maxWidth, this.maxWidth);
         this.disableCheckbox = this.getInitValue('disableCheckbox', props.disableCheckbox, this.disableCheckbox);
-        this.afterTitleSlot = props.afterTitleSlot || this.afterTitleSlot;
+        const propAfterTitleSlot = props.afterTitleSlot || this.afterTitleSlot || [];
+        this.afterTitleSlot = Array.isArray(propAfterTitleSlot) ? propAfterTitleSlot : [propAfterTitleSlot];
         this.toolbarSlot = props.toolbarSlot || this.toolbarSlot;
         this.titleSlot = props.titleSlot || this.titleSlot;
-        if (props.afterTitleSlot) {
-            this.createConditions([props.afterTitleSlot]);
+        if (this.afterTitleSlot) {
+            this.createConditions(this.afterTitleSlot);
         }
         if (props.titleSlot) {
             this.createConditions(props.titleSlot);

package/dist/zd-common.umd.js

@@ -8131,6 +8131,97 @@
       }
   }
 
+  class DataValueOutHelper {
+      static getFormParent(select) {
+          let { formParent } = select;
+          if (select.dataValueOutFormName) {
+              try {
+                  formParent = core.Metadata.getInstance(select.dataValueOutFormName);
+              }
+              catch (error) {
+                  // instance not found, use input.formParent
+              }
+          }
+          return formParent;
+      }
+      static setDataValueOut(select, value) {
+          const { dataValueOut } = select;
+          if (dataValueOut && dataValueOut.length && typeof value === 'object') {
+              const formParent = DataValueOutHelper.getFormParent(select);
+              if (formParent) {
+                  dataValueOut.forEach((columns) => {
+                      const { column, columnOnForm } = columns;
+                      if (!column || !columnOnForm)
+                          return;
+                      const currentValue = value ? value[column] : null;
+                      if (!core.Utils.isEqual(formParent.value[columnOnForm], currentValue)) {
+                          formParent.value[columnOnForm] = currentValue;
+                      }
+                  });
+              }
+          }
+      }
+  }
+
+  class DatasourceSearcher {
+      constructor() {
+          this.dsSearch = {
+              SEARCH: (value, searchIn) => ({
+                  searchIn: [searchIn],
+                  search: String(value || ''),
+              }),
+              FILTER: (value, searchIn) => ({
+                  filter: {
+                      [searchIn]: value,
+                  },
+              }),
+              FIND: (value, searchIn) => ({
+                  find: {
+                      [searchIn]: value,
+                  },
+              }),
+              DYNAMIC_FILTER: (value, search_in) => {
+                  const arrayValue = Array.isArray(value) ? value : Array.of(value);
+                  const filter = arrayValue.map((item) => ({ operation: 'EQUALS', relation: 'OR', value: item }));
+                  const dynamicFilter = { [search_in]: filter };
+                  return { dynamicFilter };
+              },
+          };
+      }
+      search(datasource, searchValue, searchIn, searchParam) {
+          return __awaiter(this, void 0, void 0, function* () {
+              // using filter/find/dynamicFilter should make only 1 request
+              // using normal search should make one request per search value
+              if (!Array.isArray(searchValue)) {
+                  return this.searchRequest(datasource, searchValue, searchIn, searchParam);
+              }
+              if (searchParam !== 'SEARCH') {
+                  const items = yield this.searchRequest(datasource, searchValue, searchIn, searchParam);
+                  return items;
+              }
+              const searchedItems = [];
+              const promises = searchValue.map((value) => __awaiter(this, void 0, void 0, function* () {
+                  const [item] = yield this.searchRequest(datasource, value, searchIn, searchParam);
+                  searchedItems.push(item);
+              }));
+              yield Promise.all(promises);
+              return searchedItems;
+          });
+      }
+      searchRequest(datasource, searchValue, searchIn, searchParam) {
+          return __awaiter(this, void 0, void 0, function* () {
+              const config = Object.assign(Object.assign(Object.assign({}, datasource.clone()), this.dsSearch[searchParam](searchValue, searchIn)), { lazyLoad: true, loadAll: Array.isArray(searchValue) });
+              const cloneDatasource = core.DatasourceFactory.factory(config);
+              const items = yield cloneDatasource.get();
+              cloneDatasource.destroy();
+              if (Array.isArray(searchValue)) {
+                  return items.filter((item) => searchValue.includes(item[searchIn]));
+              }
+              return items.filter((row) => row[searchIn] === searchValue);
+          });
+      }
+  }
+
   class Icons {
       /**
        * Replace all the icons
@@ -9354,6 +9445,8 @@
       }
   }
 
+  const combineURLs = (baseURL, relativeURL) => (`${baseURL.replace(/\/?$/, '')}/${relativeURL.replace(/^\/+/, '')}`);
+
   class Report {
       constructor(iterable, title) {
           this.endPoint = core.Config.reportsEndPoint;
@@ -9474,14 +9567,14 @@
                   filter: JSON.stringify(row.filter),
                   metaData: JSON.stringify(row.metaData),
               };
-              const url = new URL(route, this.endPoint).href;
+              const url = combineURLs(this.endPoint, route);
               const response = yield core.Http.post(url, {
                   origin,
                   requestType: 'Row',
                   row,
               });
               const reportFile = response.data.messages[0].message;
-              return new URL(reportFile, this.fileEndPoint).href;
+              return combineURLs(this.fileEndPoint, reportFile);
           });
       }
   }
@@ -9913,97 +10006,6 @@
       }
   }
 
-  class DataValueOutHelper {
-      static getFormParent(select) {
-          let { formParent } = select;
-          if (select.dataValueOutFormName) {
-              try {
-                  formParent = core.Metadata.getInstance(select.dataValueOutFormName);
-              }
-              catch (error) {
-                  // instance not found, use input.formParent
-              }
-          }
-          return formParent;
-      }
-      static setDataValueOut(select, value) {
-          const { dataValueOut } = select;
-          if (dataValueOut && dataValueOut.length && typeof value === 'object') {
-              const formParent = DataValueOutHelper.getFormParent(select);
-              if (formParent) {
-                  dataValueOut.forEach((columns) => {
-                      const { column, columnOnForm } = columns;
-                      if (!column || !columnOnForm)
-                          return;
-                      const currentValue = value ? value[column] : null;
-                      if (!core.Utils.isEqual(formParent.value[columnOnForm], currentValue)) {
-                          formParent.value[columnOnForm] = currentValue;
-                      }
-                  });
-              }
-          }
-      }
-  }
-
-  class DatasourceSearcher {
-      constructor() {
-          this.dsSearch = {
-              SEARCH: (value, searchIn) => ({
-                  searchIn: [searchIn],
-                  search: String(value || ''),
-              }),
-              FILTER: (value, searchIn) => ({
-                  filter: {
-                      [searchIn]: value,
-                  },
-              }),
-              FIND: (value, searchIn) => ({
-                  find: {
-                      [searchIn]: value,
-                  },
-              }),
-              DYNAMIC_FILTER: (value, search_in) => {
-                  const arrayValue = Array.isArray(value) ? value : Array.of(value);
-                  const filter = arrayValue.map((item) => ({ operation: 'EQUALS', relation: 'OR', value: item }));
-                  const dynamicFilter = { [search_in]: filter };
-                  return { dynamicFilter };
-              },
-          };
-      }
-      search(datasource, searchValue, searchIn, searchParam) {
-          return __awaiter(this, void 0, void 0, function* () {
-              // using filter/find/dynamicFilter should make only 1 request
-              // using normal search should make one request per search value
-              if (!Array.isArray(searchValue)) {
-                  return this.searchRequest(datasource, searchValue, searchIn, searchParam);
-              }
-              if (searchParam !== 'SEARCH') {
-                  const items = yield this.searchRequest(datasource, searchValue, searchIn, searchParam);
-                  return items;
-              }
-              const searchedItems = [];
-              const promises = searchValue.map((value) => __awaiter(this, void 0, void 0, function* () {
-                  const [item] = yield this.searchRequest(datasource, value, searchIn, searchParam);
-                  searchedItems.push(item);
-              }));
-              yield Promise.all(promises);
-              return searchedItems;
-          });
-      }
-      searchRequest(datasource, searchValue, searchIn, searchParam) {
-          return __awaiter(this, void 0, void 0, function* () {
-              const config = Object.assign(Object.assign(Object.assign({}, datasource.clone()), this.dsSearch[searchParam](searchValue, searchIn)), { lazyLoad: true, loadAll: Array.isArray(searchValue) });
-              const cloneDatasource = core.DatasourceFactory.factory(config);
-              const items = yield cloneDatasource.get();
-              cloneDatasource.destroy();
-              if (Array.isArray(searchValue)) {
-                  return items.filter((item) => searchValue.includes(item[searchIn]));
-              }
-              return items.filter((row) => row[searchIn] === searchValue);
-          });
-      }
-  }
-
   const uniqueBy = (a, key) => {
       const seen = {};
       return a.filter((item) => {
@@ -15078,11 +15080,12 @@
           this.minWidth = this.getInitValue('minWidth', props.minWidth, this.minWidth);
           this.maxWidth = this.getInitValue('maxWidth', props.maxWidth, this.maxWidth);
           this.disableCheckbox = this.getInitValue('disableCheckbox', props.disableCheckbox, this.disableCheckbox);
-          this.afterTitleSlot = props.afterTitleSlot || this.afterTitleSlot;
+          const propAfterTitleSlot = props.afterTitleSlot || this.afterTitleSlot || [];
+          this.afterTitleSlot = Array.isArray(propAfterTitleSlot) ? propAfterTitleSlot : [propAfterTitleSlot];
           this.toolbarSlot = props.toolbarSlot || this.toolbarSlot;
           this.titleSlot = props.titleSlot || this.titleSlot;
-          if (props.afterTitleSlot) {
-              this.createConditions([props.afterTitleSlot]);
+          if (this.afterTitleSlot) {
+              this.createConditions(this.afterTitleSlot);
           }
           if (props.titleSlot) {
               this.createConditions(props.titleSlot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.129.0",
+  "version": "1.130.0",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -43,5 +43,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "9ce27ad5cabfafc3aeeaea06e6995fad2bab1a65"
+  "gitHead": "2b561909b83bedc8f7c1c440e90cfe83f7ba90b6"
 }

package/types/components/zd-tree/interfaces.d.ts

@@ -53,7 +53,7 @@ export interface ITree extends IComponentRender {
     closedIconName?: string;
     allowMultiSelect?: boolean;
     allowDragDrop?: boolean;
-    afterTitleSlot?: ITreeConditionComponent;
+    afterTitleSlot?: ITreeConditionComponent | ITreeConditionComponent[];
     toolbarSlot?: IComponentRender[];
     titleSlot?: ITreeConditionComponent[];
     events?: ITreeEvents;

package/types/components/zd-tree/tree.d.ts

@@ -20,7 +20,7 @@ export declare class Tree extends ComponentRender implements ITree {
     /** Allow dragging nodes */
     allowDragDrop: boolean;
     /** Render a component in front of the node title */
-    afterTitleSlot?: ITreeConditionComponent;
+    afterTitleSlot?: ITreeConditionComponent[];
     /**
      * Components that will be rendered on toolbar slot
      */
@@ -62,7 +62,7 @@ export declare class Tree extends ComponentRender implements ITree {
     /**
      * Components that will be rendered on title slot
      */
-    titleSlot?: ITreeConditionComponent[];
+    titleSlot: ITreeConditionComponent[];
     /** Datasource object */
     datasource?: Datasource;
     /** Datasource parent field */

package/types/index.d.ts

@@ -1,6 +1,6 @@
 declare const AutoNumeric: any;
 export * from './components';
+export * from './formatters';
 export * from './services';
 export * from './utils';
-export * from './formatters';
 export { AutoNumeric };

package/types/utils/combine-urls/combine-urls.d.ts

@@ -0,0 +1,2 @@
+declare const combineURLs: (baseURL: string, relativeURL: string) => string;
+export { combineURLs };

package/types/utils/combine-urls/index.d.ts

@@ -0,0 +1 @@
+export * from './combine-urls';

package/types/utils/index.d.ts

@@ -1,8 +1,8 @@
+export * from './data-value-out';
+export * from './datasource-searcher';
 export * from './icons/icons';
 export * from './themes/themes';
 export * from './watch-url/watch-url';
 export * from './report';
 export * from './tree-data-structure';
-export * from './data-value-out';
-export * from './datasource-searcher';
 export * from './unique-by';