@mindline/sync 1.0.60 → 1.0.62

package/.vs/VSWorkspaceState.json

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

package/index.d.ts

@@ -282,7 +282,15 @@ 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,
+        ii: InitInfo,
+        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`);
                     }
                 }
@@ -1674,14 +1674,38 @@ 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,
+    ii: InitInfo,
+    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);
     }
+    ii.save();
     return result;
 }
 export async function configRemove(instance: IPublicClientApplication, authorizedUser: User, config: Config, workspaceId: string, debug: boolean): Promise<APIResult> {
@@ -1696,12 +1720,10 @@ export async function configsRefresh(instance: IPublicClientApplication, authori
             // clear Config associations as we are about to reset
             workspace.associatedConfigs.length = 0;
             // GET configs associated with this workspace
-            let configsPromise: Promise<APIResult> = configsGet(instance, authorizedUser, workspace.id, debug);
-            // wait for query to finish, return on any failure
-            let [configsResult] = await Promise.all([configsPromise]);
-            if (!configsResult.result) return configsResult;
+            let result: APIResult = await configsGet(instance, authorizedUser, workspace.id, debug);
+            if (!result.result) return result;
             // process returned workspace components
-            processReturnedConfigs(workspace, ii, configsResult.array!);
+            processReturnedConfigs(workspace, ii, result.array!);
             // tag components with workspaceIDs
             ii.tagWithWorkspaces();
         }
@@ -1809,8 +1831,8 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
         user.name = item.firstName ?? user.name;
         user.mail = item.email;
         user.tid = item.tenantId;
-        // *try* to set authority from tenant returned in previous call processReturnedTenants (it may not be there)
-        // ASSUMPTION: user either comes from
+        // *try* to set authority/companyName/companyDomain from tenant returned in previous call processReturnedTenants (it may not be there)
+        // ASSUMPTION: in terms of setting authority, user either comes from
         //      1. .NET session, in which case user has an authority from the token
         //      2. Config API, in which case either
         //          a. associated tenant with authority exists for this user (i.e. workspace owner has called POST init/configuration and created Admin and Tenant at same time)
@@ -1819,6 +1841,8 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
         let tenant: Tenant | undefined = ii.ts.find((t) => (t.tid === user.tid));
         if (tenant != undefined) {
             user.authority = tenant.authority;
+            user.companyName = tenant.name;
+            user.companyDomain = tenant.domain;
         }
         // ensure this workspace tracks this user
         let idx = workspace.associatedUsers.findIndex((u) => u === user.oid);

package/package.json

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