@apia/execution 4.0.42 → 4.0.43

package/dist/index.d.ts

@@ -1042,7 +1042,7 @@ declare class ApiaForm implements IApiaForm {
     getAllFields(): IApiaField[];
     clearForm(clearReadonlyFields: boolean, deleteGridsRows: boolean): void;
     hideModal(): void;
-    showAsModal(): void;
+    showAsModal(size?: TModalSize): void;
 }
 
 declare abstract class ApiaField<Props extends typeof FieldConstants = typeof FieldConstants> implements IApiaField<Props> {
@@ -3076,6 +3076,7 @@ type TExecutionConfig = {
     canShare: boolean;
     isEntity?: boolean;
 };
+type TModalSize = 'editGrid' | 'sm' | 'md' | 'md-fixed' | 'lg' | 'lg-fixed' | 'xl' | 'xl-fixed' | 'xxl' | 'xxxl' | 'xxxl-fixed' | 'flex' | 'cal' | 'finder' | 'fileModal';
 type TExecutionEnvironment = {
     fieldsMapping?: FieldsMapping;
     window: Window;
@@ -3090,7 +3091,10 @@ declare class Execution extends EventEmitter$1<{
     flow: 'previous' | 'confirm' | 'next' | 'save' | 'release' | 'share' | 'viewDocs' | 'print' | 'delegate';
     sendToDesktop: null;
     hideFormModal: Form;
-    showFormAsModal: Form;
+    showFormAsModal: {
+        form: Form;
+        size?: TModalSize;
+    };
 }> {
     environment: TExecutionEnvironment;
     fieldsMapping: FieldsMapping;
@@ -3601,7 +3605,7 @@ declare class Grid extends Field<GridProps, GridDefinition, GridState> {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
     }>[];
     protected rebuildGrid(xmlString: string | TApiaGridDefinition): Promise<void>;
-    protected runAction<T extends Record<string, any>>(behave: IApiaApiPostConfig<Record<string, any>>): Promise<TApiaApiAxiosResponse<(T & ResponseSysMessages) | null> | null>;
+    protected runAction<T extends Record<string, any>>(postData: IApiaApiPostConfig<Record<string, any>>): Promise<TApiaApiAxiosResponse<(T & ResponseSysMessages) | null> | null>;
     private swapRows;
     toggleMaximize(): void;
 }

package/dist/index.js

@@ -4,7 +4,7 @@ import xml2js from 'xml2js';
 import he from 'he';
 import { parseBooleans, parseNumbers } from 'xml2js/lib/processors';
 import QueryString from 'qs';
-import { arrayOrArray, EventEmitter as EventEmitter$1, isTrue, toBoolean, downloadUrl, addBoundary, formatMessage, parseAsSize, shallowEqual as shallowEqual$1, Mutex, awaitTime, noNaN as noNaN$1, getDateFormat, decodeBase64ToUtf8 as decodeBase64ToUtf8$1, uniqueId, parseXMLRequestResponse, Url, postNavigation } from '@apia/util';
+import { arrayOrArray, EventEmitter as EventEmitter$1, isTrue, toBoolean, downloadUrl, addBoundary, formatMessage, parseAsSize, shallowEqual as shallowEqual$1, Mutex, noNaN as noNaN$1, getDateFormat, decodeBase64ToUtf8 as decodeBase64ToUtf8$1, encodeStrToBase64Utf8, uniqueId, parseXMLRequestResponse, Url, postNavigation } from '@apia/util';
 import { Cell, TableController, Row, FocusControllerPlugin } from '@apia/table2-controller';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
@@ -3002,8 +3002,11 @@ class UploaderApi extends EventEmitter$1 {
   async version(file, conf = { newFiles: [] }) {
     const checkLock = await this.checkLockDocument(file.docId, true);
     const isLocked = await this.checkWebDavLock(file.docId);
-    if (checkLock === true && isLocked) {
-      if (!this.modalConfig.oneClickUpload && conf.newFiles?.length === 0) {
+    if (!(checkLock === true && isLocked))
+      return;
+    this.state.versioningFile = file;
+    const openVersionModal = () => {
+      if (!this.modalConfig.oneClickUpload) {
         this.modalController = new UploaderModalController(
           this,
           this.modalConfig,
@@ -3013,36 +3016,30 @@ class UploaderApi extends EventEmitter$1 {
         );
         this.modalController.openModal();
       }
-      this.state.versioningFile = file;
-      await this.ajaxUploadStart();
-      if (file.docTypeId)
-        this.state.selectedDocTypeId = file.docTypeId;
-      await this.versionFileInfo(file);
-      if (conf.newFiles && conf.newFiles.length > 0) {
-        const res = await this.saveDroppedFiles(conf.newFiles, {
-          langId: conf.langId,
-          translatingFile: conf.translatingFile,
-          shouldReset: false,
-          strictMode: true
-        });
-        if (res) {
-          if (!this.modalConfig.oneClickUpload) {
-            this.modalController = new UploaderModalController(
-              this,
-              this.modalConfig,
-              {
-                versionFile: file
-              }
-            );
-            this.modalController.openModal();
-          }
-        }
-      } else {
-        await this.reloadMetadata({
-          docId: file.docId,
-          docTypeId: file.docTypeId
-        });
+    };
+    if (!conf.newFiles || conf.newFiles.length === 0) {
+      openVersionModal();
+    }
+    await this.ajaxUploadStart();
+    if (file.docTypeId)
+      this.state.selectedDocTypeId = file.docTypeId;
+    await this.versionFileInfo(file);
+    const hasNewFiles = !!(conf.newFiles && conf.newFiles.length > 0);
+    if (hasNewFiles) {
+      const res = await this.saveDroppedFiles(conf.newFiles, {
+        langId: conf.langId,
+        translatingFile: conf.translatingFile,
+        shouldReset: false,
+        strictMode: true
+      });
+      if (res) {
+        openVersionModal();
       }
+    } else {
+      await this.reloadMetadata({
+        docId: file.docId,
+        docTypeId: file.docTypeId
+      });
     }
   }
   async versionFileInfo(file) {
@@ -3402,7 +3399,9 @@ class UploaderApi extends EventEmitter$1 {
     const versioningFile = this.state.versioningFile;
     if (versioningFile)
       return files;
-    const uploadedFiles = this.state.inProgressFiles;
+    const uploadedFiles = Object.values(this.state.files).filter(
+      (file) => Number(file.docId) > 0
+    );
     const existingFiles = [];
     const nonExistingFiles = [];
     if (conf?.langId) {
@@ -3415,7 +3414,7 @@ class UploaderApi extends EventEmitter$1 {
         existingFiles.push(files[0]);
     } else
       files.forEach((file) => {
-        if (uploadedFiles.find((search) => search.name === file.name)) {
+        if (uploadedFiles.find((search) => search.docName === file.name)) {
           existingFiles.push(file);
         } else
           nonExistingFiles.push(file);
@@ -3548,15 +3547,6 @@ class UploaderApi extends EventEmitter$1 {
       }
       return newFiles;
     }
-    if (files.length === 1 && conf?.translatingFile === void 0 && conf?.langId === void 0) {
-      const actualVersioningFile = Object.values(this.state.files).find(
-        (c) => (c.name || c.docName) === files[0].name
-      );
-      if (actualVersioningFile) {
-        if (actualVersioningFile.isLockedByMe)
-          this.state.versioningFile = actualVersioningFile;
-      }
-    }
     return files;
   }
   getLoadFileSystemStructureTree() {
@@ -4431,7 +4421,8 @@ class Grid extends Field {
           const res = this.runAction({
             postData: {
               gridAction: "add",
-              addRowsCount: 1
+              addRowsCount: 1,
+              fireEvents: this.hasServerAjaxEventsOfType("gridAdd")
             }
           });
           const response = await res;
@@ -4482,7 +4473,8 @@ class Grid extends Field {
     return this.asyncAction(async () => {
       const res = this.runAction({
         postData: {
-          gridAction: "delete"
+          gridAction: "delete",
+          fireEvents: this.hasServerAjaxEventsOfType("gridDelete")
         }
       });
       const currentRows = [...this.tableController.body.rows];
@@ -4539,7 +4531,8 @@ class Grid extends Field {
           const res = this.runAction({
             postData: {
               gridAction: "delete",
-              rowId: deletingIndices
+              rowId: deletingIndices,
+              fireEvents: this.hasServerAjaxEventsOfType("gridDelete")
             }
           });
           const currentRows = [...this.tableController.body.rows];
@@ -4790,7 +4783,8 @@ class Grid extends Field {
           const res = this.runAction({
             postData: {
               gridAction: "down",
-              rowId: indices
+              rowId: indices,
+              fireEvents: this.hasServerAjaxEventsOfType("gridSort")
             }
           });
           this.swapRows(indices, "down");
@@ -4828,7 +4822,8 @@ class Grid extends Field {
           const res = this.runAction({
             postData: {
               gridAction: "up",
-              rowId: indices
+              rowId: indices,
+              fireEvents: this.hasServerAjaxEventsOfType("gridSort")
             }
           });
           this.swapRows(indices, "up");
@@ -4966,14 +4961,6 @@ class Grid extends Field {
       this.tableController.clearSelection();
       this.tableController.toggleRowSelection(newRow, true);
     }
-    for (let i = 0; i < 10; i++) {
-      if (newRow.cells[0]?.getTable() instanceof TableController) {
-        newRow.cells[0]?.focus();
-        break;
-      } else {
-        await awaitTime(50);
-      }
-    }
     return newRow;
   }
   async asyncAction(cb, mutex = true) {
@@ -5075,7 +5062,7 @@ class Grid extends Field {
     });
     this.refreshColumnsVisibilities();
   }
-  async runAction(behave) {
+  async runAction(postData) {
     return post(
       this.form.execution,
       await makeApiaUrl(this.form.execution, {
@@ -5088,7 +5075,7 @@ class Grid extends Field {
       {
         postDataTreatment: "stringify",
         stringifyOptions: { arrayFormat: "repeat" },
-        ...behave
+        ...postData
       }
     );
   }
@@ -7077,8 +7064,8 @@ class ApiaForm {
   hideModal() {
     __privateGet$3(this, _execution$1).emit("hideFormModal", __privateGet$3(this, _form));
   }
-  showAsModal() {
-    __privateGet$3(this, _execution$1).emit("showFormAsModal", __privateGet$3(this, _form));
+  showAsModal(size) {
+    __privateGet$3(this, _execution$1).emit("showFormAsModal", { form: __privateGet$3(this, _form), size });
   }
 }
 _form = new WeakMap();
@@ -7485,7 +7472,7 @@ class CustomComponent {
       }),
       {
         postData: typeof body === "string" ? {
-          payload: body
+          payload: encodeStrToBase64Utf8(body)
         } : body,
         postDataTreatment: "stringify"
       }
@@ -9547,7 +9534,17 @@ class Execution extends EventEmitter$1 {
           action: "saveTask",
           asXML: true,
           react: true
-        })
+        }),
+        {
+          postData: {
+            ...this.observations.getConfirmParams(),
+            ...this.process.getConfirmParams()
+          },
+          postDataTreatment: "stringify",
+          stringifyOptions: {
+            arrayFormat: "repeat"
+          }
+        }
       );
       const canClose = response?.data?.load?.canClose;
       if (canClose) {