@apia/execution 4.0.40 → 4.0.41

package/dist/index.d.ts

@@ -2300,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 {
@@ -3396,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';

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))
@@ -1769,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;
   }
 }
 
@@ -2362,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 = {};
     }
@@ -2996,7 +2983,7 @@ class UploaderApi extends EventEmitter$1 {
     const checkLock = await this.checkLockDocument(file.docId, true);
     const isLocked = await this.checkWebDavLock(file.docId);
     if (checkLock === true && isLocked) {
-      if (!this.modalConfig.oneClickUpload) {
+      if (!this.modalConfig.oneClickUpload && conf.newFiles?.length === 0) {
         this.modalController = new UploaderModalController(
           this,
           this.modalConfig,
@@ -3012,12 +2999,24 @@ class UploaderApi extends EventEmitter$1 {
         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,
@@ -3496,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 = "";
@@ -3540,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;
@@ -5027,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 });
           }
         }
       });
@@ -5413,7 +5429,7 @@ class Radio extends FieldWithAttribute {
     return super.fireEvent(eventName, options);
   }
   getTextValue(value) {
-    return this.state.properties.possibleValue ? arrayOrArray(this.state.properties.possibleValue).find(
+    return this.properties.possibleValue ? arrayOrArray(this.properties.possibleValue).find(
       (c) => c.value === value
     )?.label : value;
   }
@@ -5443,7 +5459,7 @@ class Select extends FieldWithAttribute {
     return conf;
   }
   getTextValue(value) {
-    return this.state.properties.possibleValue ? arrayOrArray(this.state.properties.possibleValue).find(
+    return this.properties.possibleValue ? arrayOrArray(this.properties.possibleValue).find(
       (c) => c.value === value
     )?.label : value;
   }
@@ -9013,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(