@gudhub/core 1.2.4-beta.24 → 1.2.4-beta.26

package/GUDHUB/DataService/IndexedDB/IndexedDBAppService.js

@@ -307,6 +307,27 @@ export class IndexedDBAppServiceForWorker extends AppDataService {
     //   });
     // }
 
+
+    async getAppWithoutProcessing(id) {
+      let data = await this.dataService.getAppWithoutProcessing(id);
+
+      await this.putApp(id, data);
+
+      return data;
+    }
+
+    // this returns data for specific chunks + app request data
+    // async getAppWithSpecificChunksList(id, list) {
+    //   let data = await this.dataService.getAppWithoutProcessing(id);
+      
+    //   await self.putApp(id, data);
+
+
+    //   let processedData = await self.processRequestedApp(id, data);//here нужно пересмотреть
+
+    //   return processedData;
+    // }
+
     async getApp(id) {
       // if (this.requestCache.has(id)) return this.requestCache.get(id);
 

package/GUDHUB/DataService/IndexedDB/appRequestWorker.js

@@ -40,33 +40,66 @@ self.onmessage = async function(e) {
     let cached = await appDataService.getCached(e.data.id); // merge ?
 
 
+    let cachedChunksList = cached.chunks;
 
-    // TODO this is repetitive operation for getCached, maybe put all code in process or in getCached
 
-    let res = await chunkDataService.getCachedMergedChunk(e.data.id, cached.chunks);
+    let nextVersion = await appDataService.getAppWithoutProcessing(e.data.id);
 
-    // if (!res) res = [];
 
+    let isMergedChunkUpdated = true;
 
-    // TODO check that res always exists
+
+    if (
+      cachedChunksList.length != nextVersion.chunks.length
+    ) isMergedChunkUpdated = false;
+
+
+    if (
+      nextVersion.chunks.some(entry => !cachedChunksList.includes(entry))
+    ) isMergedChunkUpdated = false;
 
 
     if (
-        res
+      !isMergedChunkUpdated
     ) {
-        cached.items_list = await gudhub.util.mergeChunks([
-            // cachedApp,
-            res,
-            cached,
-        ]);
-    } else {
-        // sentData.items_list = await this.gudhub.util.mergeChunks([
-        //     cachedApp,
-        //     sentData,
-        // ]);
+
+      // TODO this is repetitive operation for getCached, maybe put all code in process or in getCached
+
+      let res = await chunkDataService.getCachedMergedChunk(e.data.id, cached.chunks);
+
+      // if (!res) res = [];
+
+
+      // // TODO check that res always exists
+
+
+      if (
+          res
+      ) {
+          cached.items_list = await gudhub.util.mergeChunks([
+              // cachedApp,
+              res,
+              cached,
+          ]);
+      } else {
+          // sentData.items_list = await this.gudhub.util.mergeChunks([
+          //     cachedApp,
+          //     sentData,
+          // ]);
+      }
+
+      // nextVersion = await appDataService.getAppWithSpecificChunksList(e.data.id, newChunksList); //todo check that here most recent always
+      nextVersion = await appDataService.getApp(e.data.id); //todo check that here most recent always
+
+
+      //TODO тут достаточно сравнить новые чанки+апп и закешированный апп, тогда будет сгенерирована вся инфа о новых данных
+
+
+      // return;
     }
 
-    let nextVersion = await appDataService.getApp(e.data.id); //todo check that here most recent always
+
+
 
 
 

package/GUDHUB/FileManager/FileManager.js

@@ -39,7 +39,7 @@ export class FileManager {
     }
   }
 
-  async updateFileFromStringApi(data, file_id, file_name, extension, format) {
+  async updateFileFromStringApi(data, file_id, file_name, extension, format, alt, title) {
     try {
       const fileObj = {
         file_name,
@@ -47,6 +47,8 @@ export class FileManager {
         file_id,
         format,
         source: data,
+        alt,
+        title
       };
 
       const file = await this.req.post({
@@ -198,13 +200,15 @@ async getFiles(app_id, filesId = []) {
     return file;
   }
 
-  async updateFileFromString(data, file_id, file_name, extension, format) {
+  async updateFileFromString(data, file_id, file_name, extension, format, alt, title) {
     const file = await this.updateFileFromStringApi(
       data,
       file_id,
       file_name,
       extension,
-      format
+      format,
+      alt,
+      title
     );
     this.updateFileInStorage(file_id, file.app_id, file);
     return file;

package/GUDHUB/Storage/ModulesList.js

@@ -931,7 +931,7 @@ export default function generateModulesList(async_modules_path, file_server_url,
             data_type: 'study_journal',
             name: 'Study Journal',
             icon: 'timeline',
-            js: 'https://gudhub.com/modules/Study-Journal/dist/main.js',
+            js: 'https://gudhub.com/modules/Study-Journal/dist/main.js?t=1',
             css: 'https://gudhub.com/modules/Study-Journal/dist/style.css',
             type: 'gh_element',
             technology: 'class'
@@ -958,11 +958,19 @@ export default function generateModulesList(async_modules_path, file_server_url,
             data_type: "text_area",
             name: "Text Area",
             icon: "text_icon",
-            js: "https://gudhub.com/modules/text-area-ghe/dist/main.js?t=1",
+            js: "https://gudhub.com/modules/text-area-ghe/dist/main.js?t=3",
             css: "https://gudhub.com/modules/text-area-ghe/dist/style.css",
             type: "gh_element",
             technology: "class",
         },
+        {
+            data_type: "resource_calendar",
+            name: "Resource Сalendar",
+            icon: "calendar",
+            url: file_server_url + '/' + async_modules_path + "resource_calendar_data.js",
+            type: 'gh_element',
+            technology: 'angular'
+        },
         /* AUTOMATION MODULES */
         /*
             We have next types for automations:

package/GUDHUB/gudhub.js

@@ -436,13 +436,15 @@ export class GudHub {
     );
   }
 
-  updateFileFromString(data, file_id, file_name, extension, format) {
+  updateFileFromString(data, file_id, file_name, extension, format, alt, title) {
     return this.fileManager.updateFileFromString(
       data,
       file_id,
       file_name,
       extension,
-      format
+      format,
+      alt,
+      title
     );
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.2.4-beta.24",
+  "version": "1.2.4-beta.26",
   "description": "",
   "main": "index.js",
   "scripts": {