jamespot-front-business 1.1.99 → 1.1.101

package/dist/cjs.js

@@ -3679,6 +3679,14 @@ const ExtraAppFieldsItemViews = {
     RECEIVEACOPY: 'RECEIVEACOPY',
     CREATIONDATE: 'CREATIONDATE',
 };
+const ExtraAppFieldsItemName = {
+    TITLE: 'title',
+    USER: 'user',
+    PUBLISHTO: 'publishTo',
+    SENDALERTTOSUBSCRIBERS: 'sendAlert',
+    RECEIVEACOPY: 'alertAuthor',
+    CREATIONDATE: 'dateCreation',
+};
 const AppFieldFormPropertyTypes = {
     LABEL: 'label',
     DESCRIPTION: 'description',
@@ -4801,7 +4809,7 @@ const installedToV2ViewNames = {
 };
 const specialAttrName = ['title', 'alertAuthor', 'sendAlert'];
 const ignoredFields = ['edito'];
-function updateViewsFromFields(clonedApp, appFields) {
+function updateViewsFromFields(views, syncViewFieldOrder, appFields) {
     return Object.assign({}, ...viewsList.map((view) => {
         var _a, _b, _c, _d, _e, _f;
         const viewItems = {};
@@ -4813,7 +4821,7 @@ function updateViewsFromFields(clonedApp, appFields) {
         if (((_d = MapExtraFieldsWithView[view]) === null || _d === void 0 ? void 0 : _d.fixed) !== undefined) {
             viewMissingFixedFields = viewMissingFixedFields.concat((_f = (_e = MapExtraFieldsWithView[view]) === null || _e === void 0 ? void 0 : _e.fixed) !== null && _f !== void 0 ? _f : []);
         }
-        Object.entries(clonedApp.views[view]).forEach(([fieldId, field]) => {
+        Object.entries(views[view]).forEach(([fieldId, field]) => {
             if (field.isFixed) {
                 viewItems[fieldId] = field;
                 viewMissingFixedFields.splice(viewMissingFixedFields.findIndex((fieldType) => fieldType === field.type), 1);
@@ -4842,10 +4850,11 @@ function updateViewsFromFields(clonedApp, appFields) {
                 console.error('ExtraAppFieldsItemViews does not have this field type: ' + fieldType);
             }
         });
+        const newFields = [];
         appFields.forEach((field, idx) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f;
             const isFieldUsedInView = field.views[view];
-            const isExistingField = Object.keys(clonedApp.views[view]).includes(field.id);
+            const isExistingField = Object.keys(views[view]).includes(field.id);
             const fieldType = field.type;
             if (AppFormBannedFromViews$1.get(fieldType) && ((_a = AppFormBannedFromViews$1.get(fieldType)) === null || _a === void 0 ? void 0 : _a.includes(view))) {
                 return;
@@ -4860,7 +4869,7 @@ function updateViewsFromFields(clonedApp, appFields) {
             if (fieldType === AppFormItemTypes.SELECT) {
                 const selectProperty = (_c = field.properties) === null || _c === void 0 ? void 0 : _c.find((prop) => prop.propertyType === AppFieldFormPropertyTypes.OPTIONS_EDITOR);
                 if (isExistingField) {
-                    const exField = clonedApp.views[view][field.id];
+                    const exField = views[view][field.id];
                     const exSelectProperty = (_d = exField.properties) === null || _d === void 0 ? void 0 : _d.find((prop) => prop.propertyType === AppFieldFormPropertyTypes.OPTIONS_EDITOR);
                     const isMultivalued = !!((_e = selectProperty === null || selectProperty === void 0 ? void 0 : selectProperty.value) === null || _e === void 0 ? void 0 : _e.canSelectMultiple);
                     const exIsMultivalued = !!((_f = exSelectProperty === null || exSelectProperty === void 0 ? void 0 : exSelectProperty.value) === null || _f === void 0 ? void 0 : _f.canSelectMultiple);
@@ -4879,11 +4888,12 @@ function updateViewsFromFields(clonedApp, appFields) {
                 }
             }
             if (isExistingField) {
-                const exField = clonedApp.views[view][field.id];
-                viewItems[field.id] = Object.assign(Object.assign(Object.assign(Object.assign({}, exField), { properties: field.properties || exField.properties || [] }), (fieldValue !== undefined && { value: fieldValue })), { isUsed: isFieldUsedInView, pos: ((_g = clonedApp.syncViewFieldOrder) === null || _g === void 0 ? void 0 : _g[view]) ? idx : exField.pos, isLockedValue: (fieldValue !== undefined || exField.value !== undefined) && exField.isLockedValue });
+                const exField = views[view][field.id];
+                viewItems[field.id] = Object.assign(Object.assign(Object.assign(Object.assign({}, exField), { properties: field.properties || exField.properties || [] }), (fieldValue !== undefined && { value: fieldValue })), { isUsed: isFieldUsedInView, pos: (syncViewFieldOrder === null || syncViewFieldOrder === void 0 ? void 0 : syncViewFieldOrder[view]) ? idx : exField.pos, isLockedValue: (fieldValue !== undefined || exField.value !== undefined) && exField.isLockedValue });
             }
             else {
-                const existingFieldsLen = Object.values(clonedApp.views[view]).filter((v) => !v.isFixed && !v.isOptional).length;
+                newFields.push({ id: field.id, idx: idx });
+                const existingFieldsLen = Object.values(views[view]).filter((v) => !v.isFixed && !v.isOptional).length;
                 viewItems[field.id] = {
                     type: field.type,
                     properties: field.properties || [],
@@ -4892,10 +4902,25 @@ function updateViewsFromFields(clonedApp, appFields) {
                     isLockedValue: false,
                     isFixed: false,
                     value: fieldValue !== null && fieldValue !== void 0 ? fieldValue : null,
-                    pos: ((_h = clonedApp.syncViewFieldOrder) === null || _h === void 0 ? void 0 : _h[view]) ? idx : existingFieldsLen + idx,
+                    pos: (syncViewFieldOrder === null || syncViewFieldOrder === void 0 ? void 0 : syncViewFieldOrder[view]) ? idx : existingFieldsLen + idx,
                 };
             }
         });
+        if (!(syncViewFieldOrder === null || syncViewFieldOrder === void 0 ? void 0 : syncViewFieldOrder[view])) {
+            newFields.forEach((nf) => {
+                const item = viewItems[nf.id];
+                item.pos = nf.idx + 1;
+                Object.keys(viewItems).forEach((k) => {
+                    const e = viewItems[k];
+                    if (e &&
+                        !Object.values(ExtraAppFieldsItemName).includes(k) &&
+                        k !== nf.id &&
+                        e.pos >= item.pos) {
+                        e.pos++;
+                    }
+                });
+            });
+        }
         return {
             [view]: viewItems,
         };
@@ -5375,7 +5400,7 @@ function InstalledAppStudioAdapter(serverApp, serverApps, state) {
         audience: serverApp.checkAccess === false ? AUDIENCE.ALL : AUDIENCE.CUSTOM,
     };
     populateFieldsAndViews(serverApp, studioApp, state);
-    studioApp.views = updateViewsFromFields(studioApp, studioApp.fields);
+    studioApp.views = updateViewsFromFields(studioApp.views, studioApp.syncViewFieldOrder, studioApp.fields);
     const inWorkAppVersion = _findAssociatedDraft(serverApp.idApp, serverApps);
     if (!inWorkAppVersion)
         return studioApp;
@@ -6039,6 +6064,7 @@ exports.AssetReservation = AssetReservation;
 exports.Bookmark = Bookmark;
 exports.Comment = Comment;
 exports.ContentReport = ContentReport;
+exports.ExtraAppFieldsItemName = ExtraAppFieldsItemName;
 exports.ExtraAppFieldsItemViews = ExtraAppFieldsItemViews;
 exports.ExtraBot = ExtraBot;
 exports.Faq = Faq;