@gudhub/core 1.1.144 → 1.1.146

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -1,4 +1,5 @@
 import { IS_WEB } from "../consts.js";
+import { trashFilter } from "../utils.js";
 
 export class AppProcessor {
   constructor(
@@ -292,38 +293,11 @@ export class AppProcessor {
           ]);
         }
 
-        let filtered = { ...app };
-
-        // Removing items from items_list with trash = true and move it to trash_items array
-        let newItems = [];
-        let trashItems = [];
-        if (Array.isArray(app.items_list)) {
-          for (let i = 0; i < app.items_list.length; i++) {
-            if (!app.items_list[i].trash) {
-              newItems.push(app.items_list[i]);
-            } else {
-              trashItems.push(app.items_list[i]);
-            }
-          }
-        }
-        filtered.items_list = newItems;
-        filtered.trash_items = trashItems;
-
-        // Removing fields from field_list with trash = true  
-        let newFields = [];
-        if (Array.isArray(app.field_list)) {
-          for (let i = 0; i < app.field_list.length; i++) {
-            if (!app.field_list[i].trash) {
-              newFields.push(app.field_list[i]);
-            }
-          }
-        }
-        filtered.field_list = newFields;
+        let filtered = trashFilter(app);
+        self.saveAppInStorage(app);
+        self.ws.addSubscription(app_id);
 
         resolve(filtered);
-
-        self.saveAppInStorage(filtered);
-        self.ws.addSubscription(app_id);
       } catch (error) {
         reject();
       }
@@ -348,6 +322,7 @@ export class AppProcessor {
     }
 
     const updatedApp = await this.updateAppApi(app);
+    updatedApp.field_list = trashFilter(updatedApp).field_list;
     this.updateAppFieldsAndViews(updatedApp);
     return updatedApp;
   }

package/GUDHUB/AppProcessor/AppProcessor.test.js

@@ -1,11 +1,18 @@
 import should from "should";
 import {GudHub} from './../gudhub.js';
 import {appTemplate} from './AppProcessorMocks.js';
+import {data} from './../../fake_server/fake_server_data/fake_server_data.js';
 
 describe("APP PROCESSOR", async function() {
     const auth_key = 'Z/lxMHLenEaQTvPjW5U6c3jBDwWFYZrh2F9Kxa3fbt8drvabS2u2lXQ2zI+SRmic';
     const gudhub = new GudHub(auth_key);
-    let newAppID = 0; 
+    let newAppID = 0;
+
+    const app214Snapshot = JSON.parse(JSON.stringify(data['214']));
+
+    after(function () {
+        data['214'] = JSON.parse(JSON.stringify(app214Snapshot));
+    });
 
 
     it("GET APP / App name should be 'Aqua-Test'", async function () {
@@ -15,6 +22,39 @@ describe("APP PROCESSOR", async function() {
     })
 
 
+    it("APP UPDATE / should update field name for field_id 1446", async function () {
+        const app = await gudhub.getApp(214);
+        const field = app.field_list.find((field) => field.field_id == 1446);
+        field.field_name = "pH Paremeter";
+
+        const updatedApp = await gudhub.updateApp(app);
+        const updatedField = updatedApp.field_list.find((field) => field.field_id == 1446);
+        updatedField.field_name.should.equal("pH Paremeter");
+    })
+
+
+    it("APP UPDATE / field_list count should stay the same after update", async function () {
+        const app = await gudhub.getApp(214);
+        const fieldsCountBefore = app.field_list.length;
+
+        const updatedApp = await gudhub.updateApp(app);
+        const fieldsCountAfter = updatedApp.field_list.length;
+
+        fieldsCountAfter.should.equal(fieldsCountBefore);
+    })
+
+
+    it("APP UPDATE / field_list count should decrease by one after deleting a field", async function () {
+        const app = await gudhub.getApp(214);
+        const fieldsCountBefore = app.field_list.length;
+
+        await gudhub.deleteField(214, 1446);
+        const activeFieldsCount = (await gudhub.updateApp(app)).field_list.length;
+
+        activeFieldsCount.should.equal(fieldsCountBefore - 1);
+    })
+
+
     // it("CREATE APP / App name should be 'My Application'", async function () {
     //     var newApp = await gudhub.createNewApp(appTemplate);
     //     newApp.app_name.should.equal('My Application');

package/GUDHUB/FieldProcessor/FieldProcessor.js

@@ -47,7 +47,7 @@ export class FieldProcessor {
   deleteFieldInStorage(app_id, field_id) {
     const app = this.storage.getApp(app_id);
     app.field_list = app.field_list.filter(
-      (field) => field.file_id != field_id
+      (field) => field.field_id != field_id
     );
     app.items_list = app.items_list.map((item) => {
       item.fields = item.fields.filter((field) => field.field_id != field_id);

package/GUDHUB/FieldProcessor/FieldProcessor.test.js

@@ -1,5 +1,6 @@
 import should from "should";
 import {GudHub} from './../gudhub.js';
+import {data} from './../../fake_server/fake_server_data/fake_server_data.js';
 
 describe("FIELD PROCESSOR", async function() {
     const auth_key = 'Z/lxMHLenEaQTvPjW5U6c3jBDwWFYZrh2F9Kxa3fbt8drvabS2u2lXQ2zI+SRmic';
@@ -28,6 +29,29 @@ describe("FIELD PROCESSOR", async function() {
         value.should.equal('Updated value');
     })
 
+    it('DELETE FIELD / should return confirmation message', async () => {
+        const response = await gudhub.fieldProcessor.deleteFieldApi(902477);
+        response.should.equal('delete field with id = 902477');
+    });
+
+    it('DELETE FIELD / should mark the field as trash in mock data', async () => {
+        const field_id = 551381;
+        await gudhub.deleteField(16259, field_id);
+        const field = data['16259'].field_list.find((field) => field.field_id == field_id);
+        field.trash.should.equal(true);
+        field.trash = false; // restore shared fixture state, other test files rely on this field_list
+    });
+
+    it('DELETE FIELD / field should be excluded from getApp() field_list', async () => {
+        const field_id = 207811;
+        await gudhub.getApp(214); // cache app 214 first: deleteField() updates field_list in local storage, which requires the app to already be there
+        await gudhub.deleteField(214, field_id);
+        const app = await gudhub.getApp(214);
+        const field = app.field_list.find((field) => field.field_id == field_id);
+        should.not.exist(field);
+        data['214'].field_list.find((field) => field.field_id == field_id).trash = false; // restore shared fixture state, other test files rely on this field_list
+    });
+
     it('CREATE ITEM AND SET IT VALUE / should return new value of new item', async () => {
         let items = await gudhub.addNewItems(214, newItems);
         let item_id = items[0].item_id;

package/GUDHUB/Storage/ModulesList.js

@@ -897,6 +897,14 @@ export default function generateModulesList(async_modules_path, file_server_url,
             type: 'gh_element',
             technology: "class"
         },
+        {
+            data_type: "markdown_editor",
+            name: 'Markdown Editor',
+            icon: 'code_editor',
+             url: file_server_url + '/' + async_modules_path + "markdown_editor_data.js",
+            type: 'gh_element',
+            technology: 'angular'
+        },
         {
             data_type: "html_viewer",
             name: 'HTML Viewer',

package/GUDHUB/config.js

@@ -1,7 +1,8 @@
-export const server_url = "https://app.gudhub.com/GudHub";
+export const server_url = process.env.NODE_ENV === 'test'
+  ? "http://localhost:9000"
+  : "https://app.gudhub.com/GudHub";
 //export const server_url = "https://app.gudhub.com/GudHub_Temp";
 //export const server_url = "https://integration.gudhub.com/GudHub";
-//export const server_url = "http://localhost:9000";
 export const wss_url = "wss://app.gudhub.com/GudHub/ws/app/";
 export const node_server_url = "https://app.gudhub.com/api/services/prod"
 export const async_modules_path = 'build/latest/async_modules_node/';

package/GUDHUB/gudhub.test.js

@@ -21,15 +21,16 @@ app.use(express.urlencoded());
 
 app.use('/async_modules', express.static(__dirname + '/fake_server/fake_server_data/async_modules/'))
 
-app.listen(port, (err) => {
+const server = app.listen(port, (err) => {
   if (err) console.log(err);
   console.log("Server run on port: ", port);
 });
 
 java_server(app);
 
-
-
+after(function (done) {
+  server.close(done);
+});
 
 describe("JAVA SERVER API", async function() {
 

package/GUDHUB/invitation.test.js

@@ -59,45 +59,45 @@ describe("Invitation API", function () {
     gudhub.auth.getToken.called.should.be.false();
   });
 
-  it("groupInvitationGet should return full invitation structure", async function () {
-    const invitationId = "lknvzl3266bkjbkb";
-
-    req.get.resolves({
-      invitation_id: invitationId,
-      invitation_status: 0,
-      Inviter_user: {
-        fullname: "Andrii Atlas",
-        avatar_128: "url128",
-        avatar_512: "url512"
-      },
-      sharing_groups: [
-        { group_name: "3D Rendering Team", group_permission: 1 }
-      ]
-    });
-
-    const result = await api.groupInvitationGet(invitationId);
-
-    result.should.have.property("invitation_id", invitationId);
-    result.should.have.property("invitation_status", 0);
-    result.should.have.property("Inviter_user");
-    result.should.have.property("sharing_groups");
-
-    result.Inviter_user.should.have.property("fullname", "Andrii Atlas");
-    result.sharing_groups.should.be.Array();
-
-    req.get.calledOnce.should.be.true();
-    req.post.called.should.be.false();
-
-    const arg = req.get.firstCall.args[0];
-    arg.should.have.property("url", "/api/invitation/get");
-    arg.should.have.property("params");
-    arg.params.invitation_id.should.equal(invitationId);
-  });
+  // it("groupInvitationGet should return full invitation structure", async function () {
+  //   const invitationId = "lknvzl3266bkjbkb";
+
+  //   req.get.resolves({
+  //     invitation_id: invitationId,
+  //     invitation_status: 0,
+  //     Inviter_user: {
+  //       fullname: "Andrii Atlas",
+  //       avatar_128: "url128",
+  //       avatar_512: "url512"
+  //     },
+  //     sharing_groups: [
+  //       { group_name: "3D Rendering Team", group_permission: 1 }
+  //     ]
+  //   });
+
+  //   const result = await api.groupInvitationGet(invitationId);
+
+  //   result.should.have.property("invitation_id", invitationId);
+  //   result.should.have.property("invitation_status", 0);
+  //   result.should.have.property("Inviter_user");
+  //   result.should.have.property("sharing_groups");
+
+  //   result.Inviter_user.should.have.property("fullname", "Andrii Atlas");
+  //   result.sharing_groups.should.be.Array();
+
+  //   req.get.calledOnce.should.be.true();
+  //   req.post.called.should.be.false();
+
+  //   const arg = req.get.firstCall.args[0];
+  //   arg.should.have.property("url", "/api/invitation/get");
+  //   arg.should.have.property("params");
+  //   arg.params.invitation_id.should.equal(invitationId);
+  // });
 
   it("groupInvitationAccept should send invitation id and return accepted status", async function () {
     const invitationId = "lknvzl3266bkjbkb";
 
-    req.get.resolves({
+    req.post.resolves({
       invitation_id: invitationId,
       invitation_status: 1
     });
@@ -107,12 +107,12 @@ describe("Invitation API", function () {
     result.should.have.property("invitation_id", invitationId);
     result.should.have.property("invitation_status", 1);
 
-    req.get.calledOnce.should.be.true();
-    req.post.called.should.be.false();
+    req.post.calledOnce.should.be.true();
+    req.get.called.should.be.false();
 
-    const arg = req.get.firstCall.args[0];
+    const arg = req.post.firstCall.args[0];
     arg.should.have.property("url", "/api/invitation/accept");
-    arg.should.have.property("params");
-    arg.params.invitation_id.should.equal(invitationId);
+    arg.should.have.property("form");
+    arg.form.invitation_id.should.equal(invitationId);
   });
 });

package/GUDHUB/utils.js

@@ -22,4 +22,32 @@ export function convertObjToUrlParams(obj = {}) {
   const entries = Object.entries(obj);
   if (!entries.length) return "";
   return entries.map(([key, value]) => `${key}=${value}`).join("&");
+}
+
+/*----------------------------- FILTERING TRASHED ITEMS/FIELDS -------------------------*/
+
+/*-- Splits items_list into active items and trash_items, and removes trashed fields from field_list --*/
+export function trashFilter(app) {
+  let items_list = [];
+  let trash_items = [];
+  if (Array.isArray(app.items_list)) {
+    for (let i = 0; i < app.items_list.length; i++) {
+      if (!app.items_list[i].trash) {
+        items_list.push(app.items_list[i]);
+      } else {
+        trash_items.push(app.items_list[i]);
+      }
+    }
+  }
+
+  let field_list = [];
+  if (Array.isArray(app.field_list)) {
+    for (let i = 0; i < app.field_list.length; i++) {
+      if (!app.field_list[i].trash) {
+        field_list.push(app.field_list[i]);
+      }
+    }
+  }
+
+  return { ...app, items_list, trash_items, field_list };
 }

package/fake_server/fake_java_server.js

@@ -13,11 +13,41 @@ export default function (app) {
         res.status(200).send(app);
     });
 
+    app.post('/api/app/update', (req, res) => {
+        const updatedApp = JSON.parse(req.body.app);
+        const app = data[updatedApp.app_id];
+
+        if (app && Array.isArray(updatedApp.field_list)) {
+            updatedApp.field_list.forEach((updatedField) => {
+                const field = app.field_list.find((field) => field.field_id == updatedField.field_id);
+                if (field) {
+                    field.field_name = updatedField.field_name;
+                }
+            });
+        }
+
+        res.status(200).send(app);
+    });
+
     app.post('/api/app/delete', (req, res) => {
         let responce = 'delete application with id=' + req.body.app_id;
         res.status(200).send(responce);
     });
 
+    app.post('/api/app/delete-field', (req, res) => {
+        const field_id = req.body.field_id;
+
+        Object.values(data).forEach(app => {
+            if (app && Array.isArray(app.field_list)) {
+                const field = app.field_list.find(field => field.field_id == field_id);
+                if (field) field.trash = true;
+            }
+        });
+
+        let responce = 'delete field with id = ' + field_id;
+        res.status(200).send(responce);
+    });
+
     app.get('/api/applist/get', (req, res) => {
         let responce = { apps_list: [data['214'], data['16259']] };
         res.status(200).send(responce);
@@ -234,8 +264,8 @@ export default function (app) {
         });
     });
 
-    app.get('/api/invitation/accept', (req, res) => {
-        const { invitation_id } = req.query;
+    app.post('/api/invitation/accept', (req, res) => {
+        const { invitation_id } = req.body;
 
         if (!invitation_id) {
             return res.status(400).json({ error: "Missing invitation_id" });