@mindline/sync 1.0.59 → 1.0.61

package/.vs/VSWorkspaceState.json

@@ -2,5 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
+  "SelectedNode": "\\configs.json",
   "PreviewInSolutionExplorer": false
 }

package/configs.json

@@ -1,11 +1 @@
-[
-  {
-    "id": "1",
-    "workspaceId": "",
-    "name": "",
-    "description": "",
-    "tenants": [],
-    "isEnabled": true,
-    "sel": true
-  }
-]
+[]

package/index.d.ts

@@ -238,7 +238,7 @@ declare module "@mindline/sync" {
             config: Config | null | undefined,
             syncPortalGlobalState: InitInfo | null,
             batchIdArray: Array<Object>,
-            setRefreshDeltaTrigger: (trigger: boolean) => void,
+            setRefreshDeltaTrigger: (workspace: string) => void,
             setReadersTotal: (readersTotal: number) => void,
             setReadersCurrent: (readersCurrent: number) => void,
             setWritersTotal: (writersTotal: number) => void,
@@ -282,7 +282,14 @@ declare module "@mindline/sync" {
     //
     // Mindline Config API
     //
-    export function configEdit(instance: IPublicClientApplication, authorizedUser: User, config: Config, workspaceId: string, debug: boolean): APIResult;
+    export function configEdit(
+        instance: IPublicClientApplication,
+        authorizedUser: User,
+        config: Config,
+        setConfigId: (id: string) => void,
+        setSelectedConfigs: (selectedConfigs: { [id: string]: boolean | number[] }) => void,
+        workspace: Workspace,
+        debug: boolean): APIResult;
     export function configRemove(instance: IPublicClientApplication, authorizedUser: User, config: Config, workspaceId: string, debug: boolean): APIResult;
     export function configsRefresh(instance: IPublicClientApplication, authorizedUser: User, workspaceId: string, ii: InitInfo, debug: boolean): APIResult;
     export function initGet(instance: IPublicClientApplication, authorizedUser: User, user: User, ii: InitInfo, tasks: TaskArray, debug: boolean): APIResult;

package/index.ts

@@ -900,7 +900,7 @@ export class BatchArray {
                 setIdleText(`${this.pb_total} seconds elapsed. Last update ${this.pb_idle} seconds ago. [max idle: ${this.pb_idleMax}/60]`);
                 if (this.pb_idle >= 60) {
                     if (this.milestoneArray.milestones[0].Write == null) {
-                        this.milestoneArray.write(setMilestones);
+                        //this.milestoneArray.write(setMilestones); -- allow sync to cntinue
                         setConfigSyncResult(`sync continuing, but no update for ${this.pb_idle} seconds`);
                     }
                 }
@@ -930,7 +930,7 @@ export class BatchArray {
         config: Config | null | undefined,
         syncPortalGlobalState: InitInfo | null,
         batchIdArray: Array<Object>,
-        setRefreshDeltaTrigger: (trigger: boolean) => void,
+        setRefreshDeltaTrigger: (workspace: string) => void,
         setReadersTotal: (readersTotal: number) => void,
         setReadersCurrent: (readersCurrent: number) => void,
         setWritersTotal: (writersTotal: number) => void,
@@ -1083,7 +1083,7 @@ export class BatchArray {
                     setConfigSyncResult("reading complete");
                     console.log(`Setting config sync result: "reading complete"`);
                     // trigger refresh delta tokens
-                    setRefreshDeltaTrigger(true);
+                    setRefreshDeltaTrigger(config!.workspaceId);
                     // change to % per second to complete in 12x as long as it took to get here
                     let readTS = Date.now();
                     let secsElapsed = (readTS - this.pb_startTS) / 1000;
@@ -1674,10 +1674,32 @@ export async function usersGet(instance: IPublicClientApplication, user: User |
     }
 }
 // ======================= Mindline Config API ===============================
-export async function configEdit(instance: IPublicClientApplication, authorizedUser: User, config: Config, workspaceId: string, debug: boolean): Promise<APIResult> {
+export async function configEdit(
+    instance: IPublicClientApplication,
+    authorizedUser: User,
+    config: Config,
+    setConfigId: (id: string) => void,
+    setSelectedConfigs: (selectedConfigs: { [id: string]: boolean | number[] }) => void,
+    workspace: Workspace,
+    debug: boolean): Promise<APIResult>
+{
     let result: APIResult = new APIResult();
     if (config.id === "1") {
-        result = await configPost(instance, authorizedUser, config, workspaceId, debug);
+        result = await configPost(instance, authorizedUser, config, workspace.id, debug);
+        if (result.result) {
+            // config id was updated from "1"
+            setConfigId(config.id);
+            // set this config as the selected config
+            const newSelection = {};
+            Object.defineProperty(newSelection, config.id, { value: true, writable: true, enumerable: true });
+            setSelectedConfigs(newSelection);
+            // update associated configs in this workspace
+            let idx: number = workspace.associatedConfigs.findIndex((id: string) => id == "1");
+            if (idx !== -1) {
+                workspace.associatedConfigs.splice(idx, 1);
+                workspace.associatedConfigs.push(config.id);
+            }
+        }
     }
     else {
         result = await configPut(instance, authorizedUser, config, debug);
@@ -1788,14 +1810,12 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
             if (dummyIndex !== -1) {
                 // clear and overwrite dummy
                 user = ii.us.at(dummyIndex);
-                // replace dummy User oid "1" with real oid in associatedTenants of all workspaces
-                ii.ws.map((w: Workspace) => {
-                    let idx: number = w.associatedUsers.findIndex((oid: string) => oid == "1");
-                    if (idx !== -1) {
-                        w.associatedUsers.splice(idx, 1);
-                        w.associatedUsers.push(item.userId);
-                    }
-                });
+                // replace dummy User oid "1" with real oid in associatedTenants of this workspace
+                let idx: number = workspace.associatedUsers.findIndex((oid: string) => oid == "1");
+                if (idx !== -1) {
+                    workspace.associatedUsers.splice(idx, 1);
+                    workspace.associatedUsers.push(item.userId);
+                }
             }
             else {
                 // create and track new user
@@ -1826,6 +1846,7 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
         let idx = workspace.associatedUsers.findIndex((u) => u === user.oid);
         if (idx == -1) workspace.associatedUsers.push(user.oid);
     });
+    ii.save();
 }
 function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTenants: Array<Object>) {
     returnedTenants.map((item) => {
@@ -1838,14 +1859,12 @@ function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTena
             if (dummyIndex !== -1) {
                 // clear and overwrite dummy
                 tenant = ii.ts.at(dummyIndex);
-                // replace dummy Tenant id "1" with real id in associatedTenants of all workspaces
-                ii.ws.map((w: Workspace) => {
-                    let idx: number = w.associatedTenants.findIndex((tid: string) => tid == "1");
-                    if (idx !== -1) {
-                        w.associatedTenants.splice(idx, 1);
-                        w.associatedTenants.push(item.tenantId);
-                    }
-                });
+                // replace dummy Tenant id "1" with real id in associatedTenants of this workspace
+                let idx: number = workspace.associatedTenants.findIndex((tid: string) => tid == "1");
+                if (idx !== -1) {
+                    workspace.associatedTenants.splice(idx, 1);
+                    workspace.associatedTenants.push(item.tenantId);
+                }
             } else {
                 // create and track new tenant
                 tenant = new Tenant();
@@ -1871,6 +1890,7 @@ function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTena
         let idx = workspace.associatedTenants.findIndex((t) => t === item.tenantId);
         if (idx == -1) workspace.associatedTenants.push(item.tenantId);
     });
+    ii.save();
 }
 function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConfigs: Array<Object>) {
     // process returned configs
@@ -1884,14 +1904,12 @@ function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConf
             if (dummyIndex !== -1) {
                 // clear and overwrite dummy
                 config = ii.cs.at(dummyIndex);
-                // replace dummy Config id "1" with real id in associatedConfigs of all workspaces
-                ii.ws.map((w: Workspace) => {
-                    let idx: number = w.associatedConfigs.findIndex((id: string) => id == "1");
-                    if (idx !== -1) {
-                        w.associatedConfigs.splice(idx, 1);
-                        w.associatedConfigs.push(item.id);
-                    }
-                });
+                // replace dummy Config id "1" with real id in associatedConfigs of this workspace
+                let idx: number = workspace.associatedConfigs.findIndex((id: string) => id == "1");
+                if (idx !== -1) {
+                    workspace.associatedConfigs.splice(idx, 1);
+                    workspace.associatedConfigs.push(item.id);
+                }
             } else {
                 // create and track new workspace
                 config = new Config();
@@ -1902,6 +1920,7 @@ function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConf
             config = ii.cs.at(csIndex);
         }
         config!.id = item.id;
+        config!.workspaceId = item.workspaceId;
         config!.name = item.name;
         config!.description = item.description;
         config!.isEnabled = item.isEnabled;
@@ -1924,6 +1943,7 @@ function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConf
         let idx = workspace.associatedConfigs.findIndex((c) => c === item.id);
         if (idx == -1) workspace.associatedConfigs.push(item.id);
     });
+    ii.save();
 }
 async function workspaceInfoGet(instance: IPublicClientApplication, authorizedUser: User, user: User, ii: InitInfo, debug: boolean): Promise<APIResult> {
     let result: APIResult = new APIResult();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "types": "index.d.ts",
   "exports": "./index.ts",
   "description": "sync is a node.js package encapsulating javscript classes required for configuring Mindline sync service.",

package/workspaces.json

@@ -4,7 +4,7 @@
     "name": "",
     "associatedUsers": [ "1" ],
     "associatedTenants": [ "1" ],
-    "associatedConfigs": [ "1" ],
+    "associatedConfigs": [ ],
     "sel":  true
   }
 ]