@yoobic/yobi 7.7.97 → 7.7.101

package/dist/collection/components/form-creator/form-creator/form-creator.js

@@ -782,6 +782,7 @@ export class YooFormCreatorComponent {
     this.selectedPageIndex = index;
   }
   async addNewPage(newPage, index) {
+    newPage = Object.assign({ _id: getUUID() }, newPage);
     this.currentSlides.splice(index, 0, newPage);
     this.selectedPageIndex = index;
     this.hasPageChanged = index;
@@ -1596,26 +1597,23 @@ export class YooFormCreatorComponent {
     }
   }
   onCustomFieldAdded(customFieldId, selectedCustomFormField, indexToAdd) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     if (!this.currentSlides[this.selectedPageIndex]) {
       return;
     }
+    indexToAdd = isNullOrUndefined(indexToAdd) ? (_b = (_a = this.currentSlides[this.selectedPageIndex]) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.length : indexToAdd;
     if (!selectedCustomFormField) {
-      selectedCustomFormField = (_a = this.customFormFields) === null || _a === void 0 ? void 0 : _a.find((customField) => customField._id === customFieldId);
+      selectedCustomFormField = (_c = this.customFormFields) === null || _c === void 0 ? void 0 : _c.find((customField) => customField._id === customFieldId);
     }
-    const newFields = createNewIdsForCustomFields(selectedCustomFormField.fields);
+    const newFields = createNewIdsForCustomFields(selectedCustomFormField.fields, ((_d = this.missionDescription) === null || _d === void 0 ? void 0 : _d.type) === 'dataset', { slideIndex: this.selectedPageIndex, itemIndex: indexToAdd });
     newFields === null || newFields === void 0 ? void 0 : newFields.forEach((field) => {
-      var _a;
+      var _a, _b;
       field.slideIndex = this.selectedPageIndex;
       field.slideTitle = (_a = this.currentSlides[this.selectedPageIndex]) === null || _a === void 0 ? void 0 : _a.title;
+      field.slideId = (_b = this.currentSlides[this.selectedPageIndex]) === null || _b === void 0 ? void 0 : _b._id;
     });
-    if (((_c = (_b = this.currentSlides[this.selectedPageIndex]) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-      if (isNullOrUndefined(indexToAdd)) {
-        this.currentSlides[this.selectedPageIndex].items = [...(_d = this.currentSlides[this.selectedPageIndex]) === null || _d === void 0 ? void 0 : _d.items, ...newFields];
-      }
-      else {
-        this.currentSlides[this.selectedPageIndex].items.splice(indexToAdd, 0, ...newFields);
-      }
+    if (((_f = (_e = this.currentSlides[this.selectedPageIndex]) === null || _e === void 0 ? void 0 : _e.items) === null || _f === void 0 ? void 0 : _f.length) > 0) {
+      this.currentSlides[this.selectedPageIndex].items.splice(indexToAdd, 0, ...newFields);
     }
     else {
       this.currentSlides[this.selectedPageIndex].items = newFields;

package/dist/collection/components/form-creator/form-creator-page-card-list/form-creator-page-card-list.js

@@ -153,7 +153,7 @@ export class YooFormCreatorPageCardListComponent {
       if (this.workflowVisibility) {
         pageEntry.pageWorkflowState = this.workflowVisibility;
         if ((_a = this.pagePermissions) === null || _a === void 0 ? void 0 : _a.length) {
-          const pagePermission = this.pagePermissions.find((permission) => permission.name === slide.title);
+          const pagePermission = this.pagePermissions.find((permission) => permission.name === slide._id || permission.name === slide.title);
           pageEntry.pageWorkflowState = getWorkflowFieldState(pagePermission, this.workflowVisibility);
         }
       }

package/dist/collection/components/form-creator/helpers/index.js

@@ -896,6 +896,8 @@ export function setChildFields(parentConditions, itemIndex) {
 export function addNewIdsToSlide(slide) {
   var _a, _b;
   const ids = [];
+  if (slide)
+    slide._id = getUUID();
   (_a = slide === null || slide === void 0 ? void 0 : slide.items) === null || _a === void 0 ? void 0 : _a.forEach((item) => {
     const newId = getUUID();
     ids.push({ oldId: item.name, newId });
@@ -1145,10 +1147,16 @@ export function cleanCustomFormFieldSlides(selectedFields, translations) {
   });
   return { cleanedFields: selectedFields, removedConditionIds };
 }
-export function createNewIdsForCustomFields(customFields) {
-  const cleanedFields = customFields.map((field) => {
+export function createNewIdsForCustomFields(customFields, isCustomDataSet, fieldLocation) {
+  const cleanedFields = customFields.map((field, fIndex) => {
     const cleanedField = cloneDeep(field);
-    cleanedField.name = getUUID();
+    if (isCustomDataSet) {
+      cleanedField.name = getCustomName(cleanedField.title, fieldLocation.slideIndex, fieldLocation.itemIndex + fIndex);
+      cleanedField.customName = getUUID();
+    }
+    else {
+      cleanedField.name = getUUID();
+    }
     return cleanedField;
   });
   cleanedFields.forEach((cleanedFeild) => {

package/dist/collection/components/form-creator/workflow/workflow.js

@@ -245,7 +245,7 @@ export class YooWorkflowComponent {
   onPageStateChange(ev) {
     var _a, _b, _c, _d;
     if (this.internalMissionDescription.slides[ev.detail.index]) {
-      const pageName = this.internalMissionDescription.slides[ev.detail.index].title;
+      const pageName = this.internalMissionDescription.slides[ev.detail.index]._id || this.internalMissionDescription.slides[ev.detail.index].title;
       const fieldPermission = { name: pageName };
       switch (ev.detail.newState.title) {
         case 'EDITABLE':
@@ -388,8 +388,9 @@ export class YooWorkflowComponent {
         }
       ], iconPairLeft: ARROW_PAIR, showBottomBorder: true, forceEntryUpdate: true, allowMultipleSelection: true, onAccordionSelected: (ev) => (this.isFieldsAccordionOpen = ev.detail.selected) },
       h("div", { slot: "CONTENTS" }, (_e = (_d = (_c = this.internalMissionDescription) === null || _c === void 0 ? void 0 : _c.slides[this.currentPageSelected]) === null || _d === void 0 ? void 0 : _d.items) === null || _e === void 0 ? void 0 : _e.map((item) => {
-        var _a, _b;
-        const pagePermission = (_b = (_a = this.currentWorkflowStep) === null || _a === void 0 ? void 0 : _a.pagesPermission) === null || _b === void 0 ? void 0 : _b.find((permission) => { var _a; return permission.name === ((_a = this.internalMissionDescription) === null || _a === void 0 ? void 0 : _a.slides[this.currentPageSelected].title); });
+        var _a, _b, _c, _d;
+        const slideName = ((_a = this.internalMissionDescription) === null || _a === void 0 ? void 0 : _a.slides[this.currentPageSelected]._id) || ((_b = this.internalMissionDescription) === null || _b === void 0 ? void 0 : _b.slides[this.currentPageSelected].title);
+        const pagePermission = (_d = (_c = this.currentWorkflowStep) === null || _c === void 0 ? void 0 : _c.pagesPermission) === null || _d === void 0 ? void 0 : _d.find((permission) => permission.name === slideName);
         const pageState = getWorkflowFieldState(pagePermission, this.defaultFieldState);
         return this.renderSimpleBlock(item, pageState);
       }))));

package/dist/collection/components/grid/ag-grid/grid-renderers.js

@@ -383,7 +383,7 @@ function photoRenderer(params) {
   return '';
 }
 function multiphotoRenderer(params) {
-  const photos = params.value;
+  const photos = compact([].concat(params.value));
   if (photos && isArray(photos) && photos.length > 0) {
     //return photos.map((photo) => `<yoo-img style="${getStyle(roundedImageStyle)}" src="${photo || ''}" />`).join(' ');
     const container = document.createElement('div');
@@ -404,6 +404,27 @@ function multiphotoRenderer(params) {
   }
   return '';
 }
+function imageRenderer(params) {
+  var _a, _b, _c;
+  let photos = [];
+  const colDef = (_a = params.column) === null || _a === void 0 ? void 0 : _a.getColDef();
+  photos = compact([].concat((_c = (_b = colDef) === null || _b === void 0 ? void 0 : _b.fieldDefinition) === null || _c === void 0 ? void 0 : _c.imagesCarousel));
+  if (photos && isArray(photos) && photos.length > 0) {
+    //return photos.map((photo) => `<yoo-img style="${getStyle(roundedImageStyle)}" src="${photo || ''}" />`).join(' ');
+    const container = document.createElement('div');
+    container.style.display = 'inherit';
+    photos.forEach((photo) => {
+      const img = document.createElement('yoo-img');
+      keys(roundedImageStyle).forEach((k) => {
+        img.style[k] = roundedImageStyle[k];
+      });
+      img.src = photo;
+      container.appendChild(img);
+    });
+    return container;
+  }
+  return '';
+}
 function videoRenderer(params) {
   return '<video class="ag-cell-image video" [src]="' + params.value + '"></video>';
 }
@@ -577,13 +598,16 @@ function catalogRenderer(params) {
   return formCatalog;
 }
 function documentRenderer(params) {
+  var _a, _b, _c, _d;
   let documents = [];
-  if (params.colDef.fieldDefinition.type === FormFieldType.document) {
-    documents = compact([].concat(params.colDef.fieldDefinition.document));
+  const colDef = (_a = params.column) === null || _a === void 0 ? void 0 : _a.getColDef();
+  if (((_c = (_b = colDef) === null || _b === void 0 ? void 0 : _b.fieldDefinition) === null || _c === void 0 ? void 0 : _c.type) === FormFieldType.document) {
+    documents = compact([].concat(colDef.fieldDefinition.document));
   }
   else {
     documents = compact([].concat(params.value));
   }
+  documents = documents.filter((d) => !!d._downloadURL);
   const wrapper = document.createElement('div');
   wrapper.classList.add('col');
   if (documents.length > 0) {
@@ -595,8 +619,9 @@ function documentRenderer(params) {
       formDocument.showActionSheet = false;
       wrapper.appendChild(formDocument);
     });
+    return ((_d = params) === null || _d === void 0 ? void 0 : _d.type) === 'excel' ? documents.map((d) => d._downloadURL).join(',') : wrapper;
   }
-  return wrapper;
+  return '';
 }
 function pricecheckRenderer(params) {
   const value = params.value;
@@ -1113,6 +1138,8 @@ export function getRenderer(renderer) {
       return photoRenderer;
     case 'multiphotoRenderer':
       return multiphotoRenderer;
+    case 'imageRenderer':
+      return imageRenderer;
     case 'videoRenderer':
       return videoRenderer;
     case 'starratingRenderer':

package/dist/collection/components/grid/gridstack/gridstack.js

@@ -1,7 +1,7 @@
 import 'gridstack/dist/h5/gridstack-dd-native';
 import { debounce } from '@shared/utils';
 import { Component, Element, Event, h, Host, Method, Prop, State, Watch } from '@stencil/core';
-import { GridStack } from 'gridstack';
+import { GridStack, Utils } from 'gridstack';
 import { DDResizable } from 'gridstack/dist/h5/dd-resizable';
 import { assign, cloneDeep, isEqual, isFunction, pick, sortBy } from 'lodash-es';
 DDResizable.prototype._resizeStopOriginal = DDResizable.prototype._resizeStop;
@@ -189,9 +189,11 @@ export class YooGridstackComponent {
       }
       delete this.containerEl.gridstack;
       this.grid = GridStack.init({
+        auto: false,
         column: this.column || 12,
         animate: true,
         disableOneColumnMode: this.forceOneColumn !== true,
+        oneColumnModeDomSort: false,
         cellHeight: this.cellHeight || 'auto',
         margin: this.itemMargin,
         acceptWidgets: '.ui-draggable',
@@ -255,10 +257,23 @@ export class YooGridstackComponent {
     }
   }
   renderConfig() {
-    var _a;
     this.grid.removeAll(true);
     this.grid.batchUpdate();
-    (_a = this.config) === null || _a === void 0 ? void 0 : _a.forEach((item) => {
+    let finalConfig = this.config;
+    if (this.column === 1 && (finalConfig === null || finalConfig === void 0 ? void 0 : finalConfig.length) > 0) {
+      finalConfig = Utils.sort(this.config, 1, this.column);
+      finalConfig.forEach((v, i) => {
+        if (i === 0) {
+          v.y = 0;
+          v.x = 0;
+        }
+        else {
+          v.x = 0;
+          v.y = finalConfig[i - 1].y + finalConfig[i - 1].h;
+        }
+      });
+    }
+    finalConfig === null || finalConfig === void 0 ? void 0 : finalConfig.forEach((item) => {
       const isHidden = !!this.hiddenWidgets.find((i) => i.id === item.id);
       const el = this.grid.addWidget(this.getItemTemplate(item, isHidden), cloneDeep(item));
       if (isHidden) {

package/dist/collection/utils/helpers/image-helpers.js

@@ -1,11 +1,11 @@
 import { cleanupWKWebViewImagePath, Cloudinary, getCssColor, isBase64, isCloudinaryLink, isImageUrl } from '@shared/utils';
 export async function getImageSize(src, onErr) {
   const img = new Image();
-  if (src && (isImageUrl(src) || isBase64(src))) {
+  if (src) {
     img.src = isCloudinaryLink(src) ? new Cloudinary(src).quality('low').getUrl() : src;
     await new Promise((resolve, reject) => {
       img.onload = () => resolve(img.width);
-      img.onerror = () => reject(onErr === null || onErr === void 0 ? void 0 : onErr());
+      img.onerror = () => isImageUrl(src) || isBase64(src) && reject(onErr === null || onErr === void 0 ? void 0 : onErr());
     });
   }
   return {