@mindline/sync 1.0.107 → 1.0.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindline/sync",
-  "version": "1.0.107",
+  "version": "1.0.109",
   "description": "sync is a node.js package encapsulating JavaScript classes required for configuring Mindline sync service.",
   "main": "dist/sync.es.js",
   "types": "dist/index.d.ts",

package/src/index.d.ts

@@ -4,12 +4,12 @@ declare module "@mindline/sync" {
     export function helloNpm(): string;
     export function getSyncVersion(): string;
 
-    export class APIResult {
+    export class APIResult<T = any> {
         result: boolean;
         status: number;
         error: string;
         version: string;
-        array: Array<Object> | null;
+        array: Array<T> | null;
         constructor();
     }
     export class azureConfig {
@@ -189,14 +189,14 @@ declare module "@mindline/sync" {
         save(): void;
         tagWithWorkspaces(): boolean;
     }
-    export type TaskType = "initialization" | 
-                            "authenticate user" | 
-                            "reload React" | 
-                            "GET tenant details" | 
-                            "POST config init" |
-                            "GET workspaces";
+    export type TaskType = "initialization" |
+        "authenticate user" |
+        "reload React" |
+        "GET tenant details" |
+        "POST config init" |
+        "GET workspaces";
     export class TaskArray {
-        tasks: Task[];  
+        tasks: Task[];
         constructor(bClearLocalStorage: boolean);
         init(bClearLocalStorage: boolean): void;
         setTaskStart(taskType: TaskType, startDate: Date): void;
@@ -257,9 +257,9 @@ declare module "@mindline/sync" {
         pb_total: number;
         pb_timer: NodeJS.Timer;
         milestoneArray: MilestoneArray;
-        constructor(config: SyncConfig|null, syncPortalGlobalState: InitInfo|null, bClearLocalStorage: boolean);
+        constructor(config: SyncConfig | null, syncPortalGlobalState: InitInfo | null, bClearLocalStorage: boolean);
         // populate tenantNodes based on config tenants
-        init(config: SyncConfig|null|undefined, syncPortalGlobalState: InitInfo|null, bClearLocalStorage: boolean): void;
+        init(config: SyncConfig | null | undefined, syncPortalGlobalState: InitInfo | null, bClearLocalStorage: boolean): void;
         initializeProgressBar(setSyncProgress: (progress: number) => void, setConfigSyncResult: (result: string) => void, setIdleText: (idleText: string) => void, setMilestones: (milestones: Milestone[]) => void): void;
         uninitializeProgressBar(setSyncProgress: (progress: number) => void, setConfigSyncResult: (result: string) => void, setIdleText: (idleText: string) => void, setMilestones: (milestones: Milestone[]) => void): void;
         initializeSignalR(
@@ -323,7 +323,7 @@ declare module "@mindline/sync" {
     }
     // ======================= Azure AD Graph API ===============================
     export function groupsGet(instance: IPublicClientApplication, user: User | undefined, groupSearchString: string): Promise<{ groups: Group[], error: string }>;
-    export function oauth2PermissionGrantsGet(options: RequestInit, user: User, spid: string, oid: string): Promise<{grants: string, error: string}>;
+    export function oauth2PermissionGrantsGet(options: RequestInit, user: User, spid: string, oid: string): Promise<{ grants: string, error: string }>;
     export function requestAdminConsent(admin: User, tct: TenantConfigType): void;
     export function servicePrincipalGet(options: RequestInit, user: User, appid: string): Promise<{ spid: string, error: string }>;
     export function signIn(user: User, tasks: TaskArray): boolean;
@@ -338,8 +338,8 @@ declare module "@mindline/sync" {
     // ======================= Mindline SyncConfig API ===============================
     export function auditConfigAdd(instance: IPublicClientApplication, user: User, ac: AuditConfig, debug: boolean): Promise<APIResult>;
     export function auditConfigRetrieve(instance: IPublicClientApplication, user: User, configurationId: string, debug: boolean): Promise<APIResult>;
-    export function auditConfigEdit(instance: IPublicClientApplication, user: User, configurationId: string, config: AuditConfig, debug: boolean): Promise<APIResult>; 
-    export function auditConfigRemove(instance: IPublicClientApplication, user: User, configurationId: string, debug: boolean): Promise<APIResult>; 
+    export function auditConfigEdit(instance: IPublicClientApplication, user: User, configurationId: string, config: AuditConfig, debug: boolean): Promise<APIResult>;
+    export function auditConfigRemove(instance: IPublicClientApplication, user: User, configurationId: string, debug: boolean): Promise<APIResult>;
     export function auditEventsRetrieve(instance: IPublicClientApplication, user: User, debug: boolean): Promise<APIResult>;
     export function configEdit(instance: IPublicClientApplication, authorizedUser: User, config: SyncConfig, setConfigId: (id: string) => void, setSelectedConfigs: (selectedConfigs: { [id: string]: boolean | number[] }) => void, workspace: Workspace, ii: InitInfo, debug: boolean): APIResult;
     export function configEnable(instance: IPublicClientApplication, authorizedUser: User, configurationId: string, enabled: boolean, debug: boolean): APIResult;

package/src/index.ts

@@ -25,12 +25,12 @@ export function getSyncVersion(): string {
     // injected at build time
     return __SYNC_VERSION__;
 }
-export class APIResult {
+export class APIResult<T = any> {
     result: boolean;
     status: number;
     error: string;
     version: string;
-    array: Array<Object> | null;
+    array: Array<T> | null;
     constructor() { this.result = true; this.status = 200; this.error = ""; this.version = getSyncVersion(); this.array = null; }
 }
 export class azureConfig {
@@ -933,13 +933,18 @@ export class BatchArray {
         this.init(config, syncPortalGlobalState, bClearLocalStorage);
         this.pb_startTS = 0;
         this.pb_progress = 0;
-        this.pb_increment = 0;
+        this.pb_increment = .25;
         this.pb_timer = null;
         this.pb_idle = 0;
         this.pb_idleMax = 0;
         this.pb_total = 0;
         this.milestoneArray = new MilestoneArray(false);
     }
+    clearStoredBatchIds(): void {
+        if (storageAvailable()) {
+            localStorage.setItem("BatchIdArray", "[]");
+        }
+    }
     // populate tenantNodes based on config tenants
     init(
         config: SyncConfig | null | undefined,
@@ -1038,6 +1043,7 @@ export class BatchArray {
                 this.pb_progress = 100;
                 setSyncProgress(this.pb_progress);
                 setIdleText(`Complete. [max idle: ${this.pb_idleMax}]`);
+                this.clearStoredBatchIds();
             }
             else {
                 // if we've gone 60 seconds without a signalR message, finish the sync
@@ -1258,6 +1264,7 @@ export class BatchArray {
                 this.milestoneArray.write(setMilestones);
                 connection.stop();
                 setConfigSyncResult("nothing to sync");
+                this.clearStoredBatchIds();
                 console.log(`Setting config sync result: "nothing to sync"`);
             }
             else {
@@ -1281,6 +1288,7 @@ export class BatchArray {
                     this.milestoneArray.write(setMilestones);
                     connection.stop();
                     setConfigSyncResult("sync complete");
+                    this.clearStoredBatchIds();
                     console.log(`Setting config sync result: "complete"`);
                 }
                 // if not, has writing even started?
@@ -2106,6 +2114,12 @@ export async function configEdit(
         result = await configPost(instance, authorizedUser, config, workspace.id, debug);
         if (result.result) {
             // config id was updated from "1"
+            // Update all TCI configIds to reference the new config ID
+            config.tenants.forEach((tci) => {
+                if (tci.configId === "1" || tci.configId === "") {
+                    tci.configId = config.id;
+                }
+            });
             if (setConfigId) {
                 setConfigId(config.id);
             }
@@ -2181,7 +2195,9 @@ export async function configsRefresh(instance: IPublicClientApplication, authori
             // console.log("Init Info-----------", currentConfig.id)
             // tag components with workspaceIDs
             ii.tagWithWorkspaces();
-            localStorage.setItem("BatchIdArray", "{}");
+            // IMPORTANT:
+            // Do not clear BatchIdArray here. It is used by the UI to restore an in-flight sync
+            // after refresh/re-login. BatchIdArray should be cleared when the sync completes.
             return result;
         } else {
             // workspace not found
@@ -3498,7 +3514,9 @@ export async function configPost(
         "sourceGroupName": ${sourceGroupName},
         "targetGroupId": ${targetGroupId},
         "targetGroupName": ${targetGroupName},
-        "configurationTenantType": "${tci.configurationTenantType}"
+        "configurationTenantType": "${tci.configurationTenantType}",
+        "isReadPermissionConsented": ${tci.isReadPermissionConsented},
+        "isWritePermissionConsented": ${tci.isWritePermissionConsented}
       }`;
     });
     configBody += `]}`;
@@ -3510,9 +3528,10 @@ export async function configPost(
         let response = await fetch(endpoint, options);
         if (response.status === 200 && response.statusText === "OK") {
             let data = await response.json();
-            config.id = data;
+            // API returns an object {id: "..."} or just the ID string directly
+            config.id = (typeof data === 'object' && data !== null && data.id) ? data.id : data;
             console.log(
-                `Successful ConfigID: ${data} from POST to /config: ${configBody}`
+                `Successful ConfigID: ${config.id} from POST to /config: ${configBody}`
             );
             return result;
         }
@@ -3575,7 +3594,9 @@ export async function configPut(
           "targetGroupId": ${targetGroupId},
           "targetGroupName": ${targetGroupName},
           "configurationTenantType": "${tci.configurationTenantType}",
-          "deltaToken": "${tci.deltaToken}"
+          "deltaToken": "${tci.deltaToken}",
+          "isReadPermissionConsented": ${tci.isReadPermissionConsented},
+          "isWritePermissionConsented": ${tci.isWritePermissionConsented}
         }`;
     });
     configBody += `]}`;
@@ -4165,4 +4186,4 @@ export async function readerStats(
         console.log(error.message);
     }
     return result;
-}
+}