@apia/execution 4.0.37 → 4.0.41

package/dist/index.d.ts

@@ -1888,18 +1888,18 @@ declare class Form extends WithProperties<TApiaFormProperties> {
         isMarkedToSign: boolean;
     };
     protected _customComponents: Map<string, CustomComponent>;
-    protected fieldsById: Map<string, Field<Record<string, any>, TApiaFieldBaseDefinition<Record<string, any>>, {
+    protected fieldsById: Map<string, Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, {
         definition: Omit<TApiaFieldBaseDefinition<Record<string, any>>, "properties">;
     }>>;
-    protected fieldsByName: Map<string, Field<Record<string, any>, TApiaFieldBaseDefinition<Record<string, any>>, {
+    protected fieldsByName: Map<string, Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, {
         definition: Omit<TApiaFieldBaseDefinition<Record<string, any>>, "properties">;
     }>>;
-    protected fieldsByAttributeId: Map<string | number, FieldWithAttribute<Record<string, any>, any, TApiaFieldWithAttributeBaseProps<Record<string, any>>>>;
-    protected fieldsByAttributeName: Map<string, FieldWithAttribute<Record<string, any>, any, TApiaFieldWithAttributeBaseProps<Record<string, any>>>>;
+    protected fieldsByAttributeId: Map<string | number, FieldWithAttribute<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, TApiaFieldWithAttributeBaseProps<Record<string, any>>>>;
+    protected fieldsByAttributeName: Map<string, FieldWithAttribute<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, TApiaFieldWithAttributeBaseProps<Record<string, any>>>>;
     protected fieldsGroups: Map<string, Grid>;
     definition: TApiaForm;
     constructor(execution: Execution, definition: TApiaForm);
-    get allFields(): Field<Record<string, any>, TApiaFieldBaseDefinition<Record<string, any>>, {
+    get allFields(): Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, {
         definition: Omit<TApiaFieldBaseDefinition<Record<string, any>>, "properties">;
     }>[];
     get customComponents(): Map<string, CustomComponent>;
@@ -1907,30 +1907,26 @@ declare class Form extends WithProperties<TApiaFormProperties> {
     openForm(): void;
     getField(field: string, index?: number): Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
-    }> | Field<Record<string, any>, TApiaFieldBaseDefinition<Record<string, any>>, {
-        definition: Omit<TApiaFieldBaseDefinition<Record<string, any>>, "properties">;
-    }> | FieldWithAttribute<Record<string, any>, any, TApiaFieldWithAttributeBaseProps<Record<string, any>>> | Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
+    }> | FieldWithAttribute<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, TApiaFieldWithAttributeBaseProps<Record<string, any>>> | Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
     }>[] | undefined;
     getFieldByAttributeId(attId: string | number, index?: number): Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
-    }> | FieldWithAttribute<Record<string, any>, any, TApiaFieldWithAttributeBaseProps<Record<string, any>>> | Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
+    }> | FieldWithAttribute<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, TApiaFieldWithAttributeBaseProps<Record<string, any>>> | Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
     }>[] | undefined;
     getFieldByAttributeName(attName: string, index?: number): Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
-    }> | FieldWithAttribute<Record<string, any>, any, TApiaFieldWithAttributeBaseProps<Record<string, any>>> | Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
+    }> | FieldWithAttribute<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, TApiaFieldWithAttributeBaseProps<Record<string, any>>> | Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
     }>[] | undefined;
     getFieldById(id: string | number, index?: number): Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
-    }> | Field<Record<string, any>, TApiaFieldBaseDefinition<Record<string, any>>, {
-        definition: Omit<TApiaFieldBaseDefinition<Record<string, any>>, "properties">;
     }> | Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, {
         definition: Omit<TApiaFieldBaseDefinition<TApiaFieldCommonProperties>, "properties">;
     }>[] | undefined;
     getFieldByName(name: string, index?: number): Field | Field[] | undefined;
-    protected getHiddenFields(): Field<Record<string, any>, TApiaFieldBaseDefinition<Record<string, any>>, {
+    protected getHiddenFields(): Field<TApiaFieldCommonProperties, TApiaFieldBaseDefinition<Record<string, any>>, {
         definition: Omit<TApiaFieldBaseDefinition<Record<string, any>>, "properties">;
     }>[];
     markFormToSign(): Promise<void>;
@@ -2304,7 +2300,8 @@ declare class UploaderApi extends EventEmitter$1<{
         shouldReset?: boolean;
     }): File[];
     parseFileDefinition: (file: TFileUploaded) => TUploaderFileInfo;
-    getLoadFileSystemStructureTree: () => Record<string, unknown>;
+    getLoadFileSystemStructureTree(): Record<string, unknown>;
+    getLoadFilesForFolderParameters(): Record<string, unknown>;
 }
 
 declare class UploaderModalController {
@@ -2401,6 +2398,7 @@ type TUploaderFileInfo = Omit<TFileUploaded, 'locked' | 'userLocking'> & {
     canEdit?: boolean;
     canRead?: boolean;
     isLocked: boolean;
+    locked?: boolean;
     isLockedByMe: boolean;
     isVirtual: boolean;
     lockingUser: string;
@@ -2434,6 +2432,7 @@ type TFileUploaded = {
     size?: string;
     userLocking: string;
     virtualDoc?: boolean;
+    locked?: boolean;
 };
 type TAjaxUploadStart = TApiaLoad<TApiaFunction<{
     general: {
@@ -3398,13 +3397,7 @@ declare class Captcha extends Field<TApiaCaptchaProperties, TApiaCaptchaDefiniti
 type CheckboxEvents = 'onClick';
 declare class Checkbox extends FieldWithAttribute<TApiaCheckboxProperties, boolean> {
     fireEvent(eventName: CheckboxEvents, options?: TFireEventOptions): Promise<boolean>;
-    protected getInitialValue({ value, properties, }: TApiaFieldWithAttributeBaseProps<TApiaCheckboxProperties>): Promise<boolean>;
-    setValue(newValue: boolean, options?: Partial<{
-        comparator: Comparator$1<any>;
-        format: 'd/m/Y' | 'apia';
-        markAsDirty: boolean;
-        synchronize: boolean;
-    }> | undefined): Promise<boolean>;
+    protected getInitialValue({ value, }: TApiaFieldWithAttributeBaseProps<TApiaCheckboxProperties>): Promise<boolean>;
 }
 
 type EditorEvents = 'onChange';
@@ -3725,12 +3718,14 @@ declare class Radio extends FieldWithAttribute<TApiaRadioProperties, number | st
     constructor({ possibleValue, ...definition }: TApiaRadioButtonDefinition);
     init(form: Form): Promise<void>;
     fireEvent(eventName: RadioEvents, options?: TFireEventOptions): Promise<boolean>;
+    getTextValue(value: any): any;
 }
 
 declare class Select extends FieldWithAttribute<TApiaSelectProperties, string, TApiaSelectDefinition> {
     constructor({ possibleValue, ...definition }: TApiaSelectDefinition);
     protected getInitialValue({ properties: { possibleValue }, }: TApiaFieldWithAttributeBaseProps<TApiaSelectProperties>): Promise<string>;
     protected getSynchronizePostConfiguration(value: any): IApiaApiPostConfig<any>;
+    getTextValue(value: any): any;
 }
 
 declare class Textarea extends TranslatableField<TApiaTextareaProperties, string> {

package/dist/index.js

@@ -10,7 +10,6 @@ import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import { MobXTree } from '@apia/tree2-controller';
 import { Scheduler } from '@apia/scheduler-controller';
-import { ApiaUtil } from '@apia/components';
 
 const deepEqual = (a, b) => {
   if (Object.is(a, b))
@@ -1273,6 +1272,9 @@ class Field extends WithProperties {
             await asyncCreateNewField(this.form.execution, this),
             ...await this.getScriptEventParams(event.fncParams)
           );
+          if (result === false) {
+            break;
+          }
         } catch (e) {
           console.error(e);
           this.form.execution.notifications.add(
@@ -1766,16 +1768,9 @@ class Checkbox extends FieldWithAttribute {
     return super.fireEvent(eventName, options);
   }
   getInitialValue({
-    value,
-    properties
+    value
   }) {
-    return value === void 0 || value === "" ? properties.checked || value : value;
-  }
-  setValue(newValue, options) {
-    if (newValue !== "") {
-      return super.setValue(isTrue(newValue), options);
-    }
-    return Promise.resolve(false);
+    return value === "" || value === void 0 ? Promise.resolve(false) : value;
   }
 }
 
@@ -2282,7 +2277,7 @@ const parseFileDefinition = (execution, fileDefinition, isSignRequired) => {
   const { lock, isLocked, lockedBy, userLocking, ...file } = fileDefinition;
   return {
     ...file,
-    isLocked: isLocked === "true" || isLocked === true,
+    isLocked: isLocked === "true" || isLocked === true || toBoolean(lock) || file.locked === true,
     isLockedByMe: (lockedBy || userLocking) === getWindow(execution).CURRENT_USER_LOGIN,
     isMarkedToSign: file.markedToSign || toBoolean(file.sign) || isSignRequired,
     isVirtual: file.virtualDoc ?? false,
@@ -2359,11 +2354,6 @@ class UploaderApi extends EventEmitter$1 {
         canRead: file.canRead
       };
     });
-    __publicField$i(this, "getLoadFileSystemStructureTree", () => ({
-      useDocTypePermitted: true,
-      docTypePermittedObjId: this.docTypePermittedObjId,
-      docTypePermittedObjType: this.type
-    }));
     if (!getWindow(this.execution).fileApi) {
       getWindow(this.execution).fileApi = {};
     }
@@ -2428,9 +2418,6 @@ class UploaderApi extends EventEmitter$1 {
     }
   }
   async onVersionUpload(file, conf = { newFiles: [] }) {
-    this.modalController = new UploaderModalController(this, this.modalConfig, {
-      versionFile: file
-    });
     this.version(file, conf);
   }
   async autoLock() {
@@ -2972,7 +2959,8 @@ class UploaderApi extends EventEmitter$1 {
   }
   async ajaxDeleteDocument(id, langId) {
     const file = this.getDocument(id);
-    if (await this.checkLockDocument(file.docId) === true) {
+    const isLocked = await this.checkLockDocument(file.docId);
+    if (isLocked === true) {
       const result = await post(
         this.execution,
         makeApiaUrl(
@@ -2992,25 +2980,48 @@ class UploaderApi extends EventEmitter$1 {
     }
   }
   async version(file, conf = { newFiles: [] }) {
-    if (await this.checkLockDocument(file.docId, true) === true && await this.checkWebDavLock(file.docId)) {
+    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) {
+        this.modalController = new UploaderModalController(
+          this,
+          this.modalConfig,
+          {
+            versionFile: file
+          }
+        );
+        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) {
-        await this.saveDroppedFiles(conf.newFiles, {
+        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
         });
-        this.modalController?.openModal();
       }
     }
   }
@@ -3022,42 +3033,44 @@ class UploaderApi extends EventEmitter$1 {
         metadatas
       } = documentInfo.function;
       const isFreeMetadata = this.state.allowedTypes.find((current) => current.id === file.docTypeId)?.free ?? false;
-      this.modalController.state = {
-        description: general.docDesc,
-        docFolder: general.docFolder === "" ? void 0 : Number(general.docFolder),
-        docPath: general.docFolderPath,
-        permissions: {
-          allowAllType: general.docAllPoolPerm,
-          users: arrayOrArray(documentInfo.function.data.permissions?.user).map(
-            (current) => {
+      if (this.modalController) {
+        this.modalController.state = {
+          description: general.docDesc,
+          docFolder: general.docFolder === "" ? void 0 : Number(general.docFolder),
+          docPath: general.docFolderPath,
+          permissions: {
+            allowAllType: general.docAllPoolPerm,
+            users: arrayOrArray(
+              documentInfo.function.data.permissions?.user
+            ).map((current) => {
               const returnObject = {
                 canUpdate: current.permType === "M",
                 userId: current.id,
                 userLogin: current.name
               };
               return returnObject;
-            }
-          ),
-          pools: arrayOrArray(documentInfo.function.data.permissions?.pool).map(
-            (current) => {
+            }),
+            pools: arrayOrArray(
+              documentInfo.function.data.permissions?.pool
+            ).map((current) => {
               const returnObject = {
                 canUpdate: current.permType === "M",
                 poolId: current.id,
                 poolName: current.name
               };
               return returnObject;
-            }
-          )
-        },
-        docExpDate: general.docExpDate,
-        fileReqError: false,
-        fromDirectoryFile: null,
-        metadata: {
-          metadataArray: arrayOrArray(metadatas?.metadata),
-          freeMetadataArray: [],
-          isFreeMetadata
-        }
-      };
+            })
+          },
+          docExpDate: general.docExpDate,
+          fileReqError: false,
+          fromDirectoryFile: null,
+          metadata: {
+            metadataArray: arrayOrArray(metadatas?.metadata),
+            freeMetadataArray: [],
+            isFreeMetadata
+          }
+        };
+      }
     }
   }
   async pickFileById(id) {
@@ -3337,7 +3350,7 @@ class UploaderApi extends EventEmitter$1 {
           action: "lockDocument",
           ajaxUrl: this.getAjaxUrl(),
           docId: file.docId,
-          lock: file.isLocked,
+          lock: file.isLocked || file.locked,
           isAjax: true,
           prefix: this.type
         })
@@ -3482,7 +3495,7 @@ class UploaderApi extends EventEmitter$1 {
     if (conf?.langId)
       return files;
     const currentFiles = this.state.inProgressFiles;
-    const alreadyUploadedFiles = this.filesArray.filter(
+    const alreadyUploadedFiles = Object.values(this.state.files).filter(
       (current) => Number(current.docId) < 0
     );
     let alreadyIncludedFileNames = "";
@@ -3526,6 +3539,20 @@ class UploaderApi extends EventEmitter$1 {
     }
     return files;
   }
+  getLoadFileSystemStructureTree() {
+    return {
+      useDocTypePermitted: true,
+      docTypePermittedObjId: this.docTypePermittedObjId,
+      docTypePermittedObjType: this.type
+    };
+  }
+  getLoadFilesForFolderParameters() {
+    return {
+      useDocTypePermitted: true,
+      docTypePermittedObjId: this.docTypePermittedObjId,
+      docTypePermittedObjType: this.type
+    };
+  }
 }
 
 var __defProp$h = Object.defineProperty;
@@ -5013,12 +5040,15 @@ class Grid extends Field {
           if (field instanceof File) {
             field.loadFromDefinition(state.file_prp);
           } else if (field instanceof ModalInput) {
-            field.setValue({
-              showValue: state.qry_show_value || "",
-              storeValue: state.value || ""
-            });
+            field.setValue(
+              {
+                showValue: state.qry_show_value || "",
+                storeValue: state.value || ""
+              },
+              { force: true }
+            );
           } else if (field instanceof FieldWithAttribute) {
-            field.setValue(state.value, { synchronize: false });
+            field.setValue(state.value, { synchronize: false, force: true });
           }
         }
       });
@@ -5398,6 +5428,11 @@ class Radio extends FieldWithAttribute {
   fireEvent(eventName, options) {
     return super.fireEvent(eventName, options);
   }
+  getTextValue(value) {
+    return this.properties.possibleValue ? arrayOrArray(this.properties.possibleValue).find(
+      (c) => c.value === value
+    )?.label : value;
+  }
 }
 
 class Select extends FieldWithAttribute {
@@ -5415,7 +5450,7 @@ class Select extends FieldWithAttribute {
   }) {
     return Promise.resolve(
       String(
-        this.state.value !== "" ? this.state.value : possibleValue?.find((c) => c.selected)?.value || possibleValue?.[0]?.value || ""
+        this.state.value !== "" ? this.state.value : possibleValue?.find((c) => c.selected)?.value ?? (possibleValue?.[0]?.value || "")
       )
     );
   }
@@ -5423,6 +5458,11 @@ class Select extends FieldWithAttribute {
     const conf = super.getSynchronizePostConfiguration(String(value));
     return conf;
   }
+  getTextValue(value) {
+    return this.properties.possibleValue ? arrayOrArray(this.properties.possibleValue).find(
+      (c) => c.value === value
+    )?.label : value;
+  }
 }
 
 class Textarea extends TranslatableField {
@@ -8989,7 +9029,7 @@ async function defaultConfirm(execution, status) {
     }
     const url = arrayOrArray(confirmResponse.data.actions?.action.param)[1];
     if (url === "callNavigateClose") {
-      ApiaUtil.instance.tabs.currentTab.close(true);
+      (getWindow(execution)?.top?.ApiaUtil).tabs.currentTab.close(true);
     } else {
       const c = new Url(url);
       getWindow(execution).location.assign(