jamespot-front-business 1.1.40 → 1.1.41

package/dist/cjs.js

@@ -2229,6 +2229,20 @@ const AppColumnsDefaultTypes = [
     exports.AppFormItemTypes.DESCRIPTION,
 ];
 const AppFormPrimaryList = [exports.AppFormItemTypes.DESCRIPTION];
+const AppFormFixedList$1 = [
+    exports.ExtraAppFieldsItemViews.TITLE,
+    exports.ExtraAppFieldsItemViews.PUBLISHTO,
+    exports.ExtraAppFieldsItemViews.SENDALERTTOSUBSCRIBERS,
+    exports.ExtraAppFieldsItemViews.RECEIVEACOPY,
+    exports.ExtraAppFieldsItemViews.USER,
+    exports.ExtraAppFieldsItemViews.CREATIONDATE,
+];
+const AppFormNoAsFieldList = [
+    exports.ExtraAppFieldsItemViews.USER,
+    exports.ExtraAppFieldsItemViews.TITLE,
+];
+const AppFormFieldOnlyInView = [exports.AppFormItemTypes.CODEHTML];
+const AppFormNonPrimaryList = AppFormNoAsFieldList.concat(AppFormFieldOnlyInView).concat(AppFormPrimaryList);
 
 var StatusType;
 (function (StatusType) {
@@ -2413,7 +2427,7 @@ function migrateJson(v1Json) {
                     : { propertyOptions: _renderSelectOptions((_g = v1FormItemProperties.options) !== null && _g !== void 0 ? _g : []) } }, baseProperty));
         }
         if (v1FormItemProperties.code) {
-            v2Properties.push(Object.assign({ propertyType: exports.AppFieldFormPropertyTypes.RICHTEXT, value: v1FormItemProperties.code.html || v1FormItemProperties.code.text || '' }, baseProperty));
+            v2Properties.push(Object.assign({ propertyType: exports.AppFieldFormPropertyTypes.RICHTEXT, value: { html: v1FormItemProperties.code.html, text: v1FormItemProperties.code.text } }, baseProperty));
         }
         if (Object.prototype.hasOwnProperty.call(v1FormItemProperties, 'digits')) {
             v2Properties.push(Object.assign({ propertyType: exports.AppFieldFormPropertyTypes.CHECKBOX, value: v1FormItemProperties.digits || false, checkBoxOptions: [{ label: 'APPSTUDIO_FormEditProps_Digits', value: v1FormItemProperties.digits }] }, baseProperty));
@@ -2493,6 +2507,7 @@ function migrateJson(v1Json) {
 }
 
 function InstalledAppStudioAdapter(serverApp, serverApps) {
+    var _a, _b, _c, _d;
     const { version, dateCreation } = serverApp.manifest;
     const appTypeServer = serverApp.typeModel;
     const views = Object.assign({}, ...viewsList.map((view) => ({
@@ -2502,7 +2517,7 @@ function InstalledAppStudioAdapter(serverApp, serverApps) {
         idApp: serverApp.idApp,
         status: _formatStatus(serverApp),
         studioVersion: 2,
-        manifest: Object.assign({ appShortName: serverApp.name, appName: serverApp.label, description: serverApp.description, author: serverApp.author, cssColor: appTypeServer.cssColor, cssClass: { label: appTypeServer.cssClass, value: appTypeServer.cssClass }, version: version, dateCreation: dateCreation, checkAccess: serverApp.checkAccess, attrExposed: serverApp.attrExposed, viewSolr: serverApp.view, typeLabel: appTypeServer.typeLabel }, (serverApp.articlesCount && { articlesCount: serverApp.articlesCount })),
+        manifest: Object.assign({ appShortName: serverApp.name, appName: serverApp.label, description: serverApp.description, author: serverApp.author, cssColor: (_a = appTypeServer.cssColor) !== null && _a !== void 0 ? _a : '#392994', cssClass: { label: (_b = appTypeServer.cssClass) !== null && _b !== void 0 ? _b : 'star', value: (_c = appTypeServer.cssClass) !== null && _c !== void 0 ? _c : 'star' }, version: version, dateCreation: dateCreation, checkAccess: serverApp.checkAccess, attrExposed: serverApp.attrExposed, viewSolr: serverApp.view, typeLabel: (_d = appTypeServer.typeLabel) !== null && _d !== void 0 ? _d : {} }, (serverApp.articlesCount && { articlesCount: serverApp.articlesCount })),
         fields: [],
         views,
         installFor: serverApp.accessRightObjectList,
@@ -2571,19 +2586,19 @@ function appToXml(studioApp) {
     const { manifest, views, audience, installFor } = studioApp;
     return `<?xml version='1.0' encoding='utf-8'?>
     <Application>
-        ${createAppManifest(manifest, views, audience, installFor)}
+        ${createAppManifest(manifest, views, audience, installFor, studioApp.idApp)}
         <Types>
             <objecttype
                 label="${manifest.typeLabel}" 
                 labelPlural="${manifest.typeLabel}" 
                 labelLinkSingular="${manifest.typeLabel}" 
                 labelLinkPlural="${manifest.typeLabel}" 
-                name="${manifest.appShortName}" 
+                name="${studioApp.idApp}" 
                 classImpl="JPBEContent" 
                 classCodeLocation="jamespot/jpro/objs/JPBEContent.php" 
                 cssClass="${manifest.cssClass.value}" 
                 cssColor="${manifest.cssColor}" 
-                searchtab="${manifest.appShortName}"
+                searchtab="${studioApp.idApp}"
                 searchtablabel="${manifest.typeLabel}" 
                 buttonlabel="${manifest.typeLabel}"
                 extends="article">
@@ -2594,14 +2609,14 @@ function appToXml(studioApp) {
         </Types>
     </Application>`;
 }
-function createAppManifest(manifest, views, audience, installFor) {
+function createAppManifest(manifest, views, audience, installFor, idApp) {
     var _a;
     return `<Manifest>
             <ShowImport>true</ShowImport>
-            <AppShortName>${manifest.appShortName}</AppShortName>
+            <AppShortName>${idApp}</AppShortName>
             <AppName>${manifest.appName}</AppName>
             <Description>${manifest.description}</Description>
-            <Version>${manifest.version}</Version>
+            <Version>${manifest.version + 1}</Version>
             <ManifestVersion>1.0</ManifestVersion>
             <StudioVersion>2</StudioVersion>
             <DateCreation>${manifest.dateCreation.toString().split('T')[0]}</DateCreation>
@@ -2610,7 +2625,7 @@ function createAppManifest(manifest, views, audience, installFor) {
             <Categories>N.A.</Categories>
             <Editor>Jamespot</Editor>
             <EditorUrl>https://www.fr.jamespot.com/</EditorUrl>
-            <Type>${manifest.appShortName}</Type>
+            <Type>${idApp}</Type>
             ${renderAppView(manifest.viewSolr, views.list)}
             ${renderAppSearch(views.filter)}
             ${renderAudience(audience, installFor)}
@@ -2618,7 +2633,7 @@ function createAppManifest(manifest, views, audience, installFor) {
         </Manifest>`;
 }
 function renderAppView(viewSolr, listView) {
-    if (viewSolr === 'solr') {
+    if (viewSolr === STUDIO_VIEW.SOLR) {
         let xml = '<AppView>solr</AppView>';
         const formItemIdInList = [];
         Object.entries(listView).forEach(([fieldId, field]) => {
@@ -2639,10 +2654,20 @@ function renderAppSearch(searchView) {
 }
 function getAttrNameFormItem(field, fieldId) {
     function fieldType() {
+        if (field.type === exports.ExtraAppFieldsItemViews.TITLE)
+            return 'title';
+        if (field.type === exports.ExtraAppFieldsItemViews.SENDALERTTOSUBSCRIBERS)
+            return 'sendAlert';
+        if (field.type === exports.ExtraAppFieldsItemViews.RECEIVEACOPY)
+            return 'alertAuthor';
+        if (field.type === exports.ExtraAppFieldsItemViews.PUBLISHTO)
+            return 'publishTo';
         if (field.type === exports.ExtraAppFieldsItemViews.USER)
             return 'idUser';
         if (field.type === exports.ExtraAppFieldsItemViews.CREATIONDATE)
             return 'dateCreation';
+        if (field.type === exports.AppFormItemTypes.DESCRIPTION)
+            return 'description';
         return field.type;
     }
     return (AppColumnsDefaultTypes.includes(field.type) ? fieldType() : uuid2Alpha(fieldId)).toLowerCase();
@@ -2667,7 +2692,7 @@ function renderCustomFields(fields) {
     const filteredCustomFields = customFields === null || customFields === void 0 ? void 0 : customFields.filter((field) => field.type !== exports.AppFormItemTypes.IMAGE);
     if (filteredCustomFields.length === 0)
         return '';
-    const articlesTablesItems = filteredCustomFields.filter((f) => f.type !== exports.AppFormItemTypes.TAGS);
+    const articlesTablesItems = filteredCustomFields.filter((f) => f.type !== exports.AppFormItemTypes.TAGS && !AppFormNonPrimaryList.includes(f.type));
     const linksTableItems = filteredCustomFields.filter((f) => f.type === exports.AppFormItemTypes.TAGS);
     return `<custom>
         ${articlesTablesItems.length > 0
@@ -2676,7 +2701,7 @@ function renderCustomFields(fields) {
                 </articlemstable>`
         : ''}
         ${linksTableItems.length > 0
-        ? `<linkstable>
+        ? `<linkstable tablename="tag_links" sqlNameColumn="name" sqlSrcIdColumn="srcId" sqlSrcTypeColumn="srcType" sqlTargetIdColumn="targetId" sqlTargetTypeColumn="targetType">
                     ${linksTableItems.map((field) => formItem2xml(field)).join('')}
                 </linkstable>`
         : ''}</custom>`;
@@ -2694,7 +2719,7 @@ function formItem2xml(field) {
         solr.indexed="true" 
         solr.stored="true" 
         solr.searchable="true" 
-        solr.multiValued="${field.type === exports.AppFormItemTypes.TAGS || (field.type === exports.AppFormItemTypes.CHECKBOX && true) || false}"
+        solr.multiValued="${field.type === exports.AppFormItemTypes.TAGS || field.type === exports.AppFormItemTypes.CHECKBOX ? true : false}"
         teaser="true"
         display="true"
         >
@@ -2740,14 +2765,16 @@ function renderWidget(fieldType, fieldProperties) {
             </widget>`;
         }
         case exports.AppFormItemTypes.RADIO: {
-            const optionEditor = fieldProperties === null || fieldProperties === void 0 ? void 0 : fieldProperties.find((property) => property.propertyType === exports.AppFieldFormPropertyTypes.CHECKBOX);
+            const optionEditor = fieldProperties === null || fieldProperties === void 0 ? void 0 : fieldProperties.find((property) => property.propertyType === exports.AppFieldFormPropertyTypes.OPTIONS_EDITOR);
             if (!optionEditor)
                 return '';
             const options = optionEditor.value.propertyOptions;
             return `<widget form="radio">
+            <options>
             ${options
                 .map((option) => `<option value="${option.value}" label="${option.title}"></option>`)
                 .join('')}
+            </options>
             </widget>`;
         }
         case exports.AppFormItemTypes.TOGGLE:
@@ -2769,14 +2796,14 @@ function renderWidget(fieldType, fieldProperties) {
             </widget>`;
         }
         case exports.AppFormItemTypes.CHECKBOX: {
-            const optionEditor = fieldProperties === null || fieldProperties === void 0 ? void 0 : fieldProperties.find((property) => property.propertyType === exports.AppFieldFormPropertyTypes.CHECKBOX);
+            const optionEditor = fieldProperties === null || fieldProperties === void 0 ? void 0 : fieldProperties.find((property) => property.propertyType === exports.AppFieldFormPropertyTypes.OPTIONS_EDITOR);
             if (!optionEditor)
                 return '';
             const options = optionEditor.value.propertyOptions;
             return `<widget form="checkbox" multiple="1">
                 <options>
                     ${options
-                .map((option) => `<option value="${option.value}" label="${option.label}"></option>`)
+                .map((option) => `<option value="${option.value}" label="${option.title}"></option>`)
                 .join('')}
                 </options>
             </widget>`;
@@ -2784,7 +2811,7 @@ function renderWidget(fieldType, fieldProperties) {
         case exports.AppFormItemTypes.ADDFILEATTACHMENT:
             return `<widget form="file" type="fileArticle" multiple="1"></widget>`;
         case exports.AppFormItemTypes.URL:
-            return `<widget form="url"`;
+            return `<widget form="url"></widget>`;
         case exports.AppFormItemTypes.EMAIL:
             return `<widget form="email"></widget>`;
         case exports.ExtraAppFieldsItemViews.USER:
@@ -2797,7 +2824,7 @@ function renderWidget(fieldType, fieldProperties) {
                     <param key="namespace" value="jamespot"></param>
                     <param key="types" value="user"></param>
                     <param key="views" value="user"></param>
-                    <param key="jcomplete-url" value="/?action=ajax&amp;group=autocomplete&amp;export function=user"></param>
+                    <param key="jcomplete-url" value="/?action=ajax&amp;group=autocomplete&amp;function=user"></param>
                 </params>
             </widget>`;
         case exports.AppFormItemTypes.CONTENTLINK: {
@@ -2811,7 +2838,7 @@ function renderWidget(fieldType, fieldProperties) {
                     <param key="namespace" value="jamespot"></param>
                     <param key="types" value="${type}"></param>
                     <param key="views" value="article"></param>
-                    <param key="jcomplete-url" value="/?action=ajax&amp;group=autocomplete&amp;export function=article&amp;types=[]=${type}"></param>
+                    <param key="jcomplete-url" value="/?action=ajax&amp;group=autocomplete&amp;function=article&amp;types=[]=${type}"></param>
                 </params>
             </widget>`;
         }
@@ -2931,7 +2958,7 @@ function renderDisplays(studioApp) {
         }
     });
     if (toRet.length > 0) {
-        toRet = `<displays type="${studioApp.manifest.appShortName}">${toRet}</displays>`;
+        toRet = `<displays type="${studioApp.idApp}">${toRet}</displays>`;
     }
     return toRet;
 }
@@ -2949,6 +2976,8 @@ function getDisplayName(fieldId, view) {
             return 'idUser';
         case exports.ExtraAppFieldsItemViews.CREATIONDATE:
             return 'dateCreation';
+        case exports.AppFormItemTypes.DESCRIPTION:
+            return 'description';
         default:
             return uuid2Alpha(fieldId);
     }
@@ -3021,14 +3050,7 @@ function renderDisplayAttr(fieldId, view) {
     else {
         switch (view.type) {
             case exports.AppFormItemTypes.CODEHTML: {
-                const content = {
-                    ref: attrName,
-                    fixedValue: {
-                        html: view.value.html,
-                        text: view.value.text,
-                    },
-                };
-                xml += `<html><![CDATA[ <!-- <JAMESPOT.STUDIO.CODEHTML>${JSON.stringify(content)}</JAMESPOT.STUDIO.CODEHTML><JAMESPOT.STUDIO.FIELD_POS></JAMESPOT.STUDIO.FIELD_POS>-->]]></html>`;
+                xml += `<html><![CDATA[ <!-- <JAMESPOT.STUDIO.CODEHTML>${view.value}</JAMESPOT.STUDIO.CODEHTML><JAMESPOT.STUDIO.FIELD_POS>${view.pos}</JAMESPOT.STUDIO.FIELD_POS>-->${view.value}]]></html>`;
                 break;
             }
             case exports.AppFormItemTypes.IMAGE:
@@ -3088,7 +3110,7 @@ const saveCurrentStudioApp = toolkit.createAsyncThunk('studio/saveCurrentStudioA
         return rejectWithValue(error);
     }
 }));
-const installStudioApp = toolkit.createAsyncThunk('studio/installApp', (_, { extra, rejectWithValue, getState, dispatch }) => __awaiter(void 0, void 0, void 0, function* () {
+const installStudioApp = toolkit.createAsyncThunk('studio/installApp', ({ callback }, { extra, rejectWithValue, getState, dispatch }) => __awaiter(void 0, void 0, void 0, function* () {
     const jApi = extra.jApi;
     const error = { error: 1, errorMsg: 'Error saving application' };
     const currentStudioApp = getState().studio.currentStudioApp.currentStudioApp;
@@ -3098,7 +3120,9 @@ const installStudioApp = toolkit.createAsyncThunk('studio/installApp', (_, { ext
     const xml = appToXml(currentStudioApp);
     try {
         yield jApi.application.install(xml);
-        dispatch(Toast.actions.success({ label: 'APPSTUDIO_AppItem_Edition_Saved' }));
+        dispatch(Toast.actions.success({ label: 'APPSTUDIO_AppItem_Installed' }));
+        if (callback)
+            callback();
         return;
     }
     catch (_) {
@@ -3227,7 +3251,7 @@ function createNewStudioApp$1({ author, appName }) {
                 },
                 version: 0.1,
                 dateCreation: new Date().toISOString(),
-                viewSolr: 'solr',
+                viewSolr: STUDIO_VIEW.SOLR,
                 checkAccess: false,
                 accessRightList: '',
                 attrExposed: [],
@@ -3265,7 +3289,7 @@ const fetchStudioAppsList = toolkit.createAsyncThunk('studio/appsList', (_, { ex
         throw rejectWithValue({ error: 1, errorMsg: 'Error retrieving applications' });
     }
 }));
-const createNewStudioApp = toolkit.createAsyncThunk('studio/createApp', ({ appName }, { extra, dispatch, rejectWithValue, getState }) => __awaiter(void 0, void 0, void 0, function* () {
+const createNewStudioApp = toolkit.createAsyncThunk('studio/createApp', ({ appName, callback }, { extra, dispatch, rejectWithValue, getState }) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const jApi = extra.jApi;
     const author = (_a = getState().userCurrent) === null || _a === void 0 ? void 0 : _a.uri;
@@ -3274,6 +3298,8 @@ const createNewStudioApp = toolkit.createAsyncThunk('studio/createApp', ({ appNa
         yield jApi.application.save(newAppId, JSON.stringify(newStudioApp), 'saved');
         dispatch(Toast.actions.success({ label: 'APPSTUDIO_StudioApp_Created' }));
         dispatch(CurrentStudioAppSlice.actions.setCurrentApp(newStudioApp));
+        if (callback)
+            callback();
         return newStudioApp;
     }
     catch (_) {
@@ -3367,7 +3393,10 @@ const StudioAppsListSlice = toolkit.createSlice({
                 state.deleteStudioAppStatus = 'idle';
             }
             state.studioAppsList = state.studioAppsList.reduce((acc, app) => {
-                const { idApp, status } = action.meta.arg;
+                const { idApp } = action.meta.arg;
+                let { status } = action.meta.arg;
+                if (status === APP_STATUS_TYPE.INSTALLED)
+                    status = APP_STATUS_TYPE.SUSPENDED;
                 if (app.idApp === idApp && app.status === status)
                     return acc;
                 if (app.inWorkVersion &&
@@ -3491,6 +3520,10 @@ exports.AUDIENCE = AUDIENCE;
 exports.Animations = Animations;
 exports.AppColumnsDefaultTypes = AppColumnsDefaultTypes;
 exports.AppFormBannedFromViews = AppFormBannedFromViews$1;
+exports.AppFormFieldOnlyInView = AppFormFieldOnlyInView;
+exports.AppFormFixedList = AppFormFixedList$1;
+exports.AppFormNoAsFieldList = AppFormNoAsFieldList;
+exports.AppFormNonPrimaryList = AppFormNonPrimaryList;
 exports.AppFormPrimaryList = AppFormPrimaryList;
 exports.AppFormUniqueList = AppFormUniqueList;
 exports.Application = Application;