@gudhub/core 1.1.124 → 1.1.126

package/GUDHUB/Utils/FIleHelper/FileHelper.js

@@ -3,67 +3,117 @@ export class FileHelper {
         this.gudhub = gudhub;
     }
 
-    fileInstallerHelper(appId, items, elementId) {
-        const self = this;
-        return new Promise(resolve => {
-            const files = [[]];
-            let chainPromises = Promise.resolve();
-            let results = [];
-
-            items.forEach(item => {
-                const itemId = item.item_id;
-                const field = item.fields.find(field => field.element_id === elementId);
-
-                if(field && field.field_value) {
-                    const fileIds = field.field_value.split('.');
-
-                    fileIds.forEach(fileId => {
-                        const newFile = {
-                            source: fileId,
-                            destination: {
-                                app_id: appId,
-                                item_id: itemId,
-                                element_id: elementId
-                            }
-                        }
+    async fileInstallerHelper(
+        mapAppIds,
+        appId,
+        items,
+        elementId,
+        isInstallFromRemoteServer,
+        remoteServerGudHubInstance
+    ) {
+        const files = [[]];
+        let results = [];
+
+        items.forEach(item => {
+            const itemId = item.item_id;
+            const field = item.fields.find(field => field.element_id === elementId);
+
+            if (field?.field_value) {
+                const fileIds = field.field_value.split('.');
 
-                        if(files[files.length - 1].length !== 10) { // 10 - max duplicate files
-                            files[files.length - 1].push(newFile);
-                        } else {
-                            files.push([newFile]);
+                fileIds.forEach(fileId => {
+                    const newFile = {
+                        source: fileId,
+                        destination: {
+                            app_id: appId,
+                            item_id: itemId,
+                            element_id: elementId
                         }
-                    })
-                }
-            });
-
-            files.forEach(filePack => {
-                chainPromises = chainPromises.then(() => {
-                    return self.gudhub.duplicateFile(filePack);
-                }).then(result => {
-                    results = [
-                        ...results,
-                        ...result
-                    ]
-                })
-            });
-
-            chainPromises.then(() => {
-                items.forEach(item => {
-                    const itemId = item.item_id;
-                    const field = item.fields.find(field => field.element_id === elementId);
-
-                    if(field && field.field_value) {
-                        field.field_value = '';
-                        results.forEach(file => {
-                            if(file.item_id === itemId) {
-                                field.field_value = field.field_value.split(',').filter(fileId => fileId).concat(file.file_id).join(',');
-                            }
-                        })
+                    };
+
+                    if (files[files.length - 1].length !== 10) { // 10 - max duplicate files
+                        files[files.length - 1].push(newFile);
+                    } else {
+                        files.push([newFile]);
                     }
-                })
+                });
+            }
+        });
+
+        for (const filePack of files) {
+            if (!filePack.length) continue;
+
+            let result;
+
+            if (isInstallFromRemoteServer) {
+                result = await this._copyFilesFromRemoteServer(mapAppIds, filePack, remoteServerGudHubInstance);
+            } else {
+                result = await this.gudhub.duplicateFile(filePack);
+            }
+
+            results = [
+                ...results,
+                ...result
+            ];
+        }
+
+        items.forEach(item => {
+            const itemId = item.item_id;
+            const field = item.fields.find(field => field.element_id === elementId);
+
+            if (field?.field_value) {
+                field.field_value = '';
 
-                resolve();
-            })
+                results.forEach(file => {
+                    if (file.item_id === itemId) {
+                        field.field_value = field.field_value
+                            .split(',')
+                            .filter(fileId => fileId)
+                            .concat(file.file_id)
+                            .join(',');
+                    }
+                });
+            }
         });
     }
+
+    async _copyFilesFromRemoteServer(apps, filePack, remoteServerGudHubInstance) {
+        const createdFiles = [];
+
+        for (const file of filePack) {
+            const sourceFileIds = String(file.source)
+                .split(',')
+                .map(fileId => fileId.trim())
+                .filter(Boolean);
+
+            const appMap = apps.find(
+                app => app.new_app_id === file.destination.app_id
+            );
+
+            if (!appMap) {
+                console.warn('App mapping not found for:', file.destination.app_id);
+                continue;
+            }
+
+            const sourceAppId = appMap.old_app_id;
+
+            for (const sourceFileId of sourceFileIds) {
+                const sourceFile = await remoteServerGudHubInstance.getFile(
+                    sourceAppId,
+                    sourceFileId
+                );
+
+                const createdFile = await this.gudhub.uploadFileFromString({
+                    ...sourceFile,
+                    app_id: file.destination.app_id,
+                    item_id: file.destination.item_id,
+                    element_id: file.destination.element_id
+                });
+
+                createdFiles.push(createdFile);
+            }
+        }
+
+        return createdFiles;
+    }
 }

package/GUDHUB/Utils/Utils.js

@@ -178,12 +178,12 @@ export class Utils {
     return compiler(scheme, item, this, variables, appId)
   }
 
-  fileInstallerHelper(appId, items, elementId) {
-    return this.FileHelper.fileInstallerHelper(appId, items, elementId);
+  fileInstallerHelper(mapAppIds, appId, items, elementId, isInstallFromRemoteServer, remoteServerGudHubInstance) {
+    return this.FileHelper.fileInstallerHelper(mapAppIds, appId, items, elementId, isInstallFromRemoteServer, remoteServerGudHubInstance);
   }
-
-  createAppsFromTemplate(pack, maxNumberOfInsstalledItems, progressCallback, installFromMaster) {
-    return this.AppsTemplateService.createAppsFromTemplate(pack, maxNumberOfInsstalledItems, progressCallback, installFromMaster);
+  
+  createAppsFromTemplate(pack, remoteServerUrl, remoteServerAuthKey, isInstallFromRemoteServer, maxNumberOfInstalledItems, progressCallback) {
+    return this.AppsTemplateService.createAppsFromTemplate(pack, remoteServerUrl, remoteServerAuthKey, isInstallFromRemoteServer, maxNumberOfInstalledItems, progressCallback);
   }
 
   createApps(pack) {

package/GUDHUB/Utils/sharing/GroupInvitation.js

@@ -35,9 +35,9 @@ export class GroupInvitation {
 
     async groupInvitationAccept(invitationId) {
         try {
-            return await this.req.get({
+            return await this.req.post({
                 url: "/api/invitation/accept",
-                params: {
+                form: {
                     invitation_id: invitationId
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.1.124",
+  "version": "1.1.126",
   "description": "",
   "main": "index.js",
   "scripts": {