@imposium-hub/components 2.9.0-1 → 2.9.0-11

package/src/services/API.ts

@@ -120,8 +120,6 @@ export interface IImposiumAPI {
     addUser(organizationId: string, email: string, roleId: number);
     updateRole(organizationId: string, userId: string, roleId: number);
     deleteUser(organizationId: string, userId: string);
-    getPlayerMetrics(storyId: string, start: number, end: number, alias: string);
-    getSystemMetrics(storyId: string, start: number, end: number, step: number, alias: string);
     getOrganizations(page: number, itemsPerPage: number): Promise<any[]>;
     addOrganization(orgName: string, enableCloudfront: boolean, defaultStory?: string);
     cancelExperiencePolling();
@@ -159,6 +157,7 @@ export interface IImposiumAPI {
     removeAllQueueAssocs(queueId: string);
     removeQueueAssoc(queueId: string, storyId: string);
     getQueueStories(config: any, itemsPerPage: number);
+    cancelAllPendingRequests();
     getToken: any;
 }
 
@@ -172,11 +171,6 @@ interface ITTSOptions {
     minimum_silence_length?: number;
 }
 
-interface ICancelTokenCache {
-    player: CancelTokenSource | undefined;
-    system: CancelTokenSource | undefined;
-}
-
 export default class API {
     private http: AxiosInstance;
 
@@ -188,17 +182,14 @@ export default class API {
 
     private jobPollTimer: any;
 
-    private cancelTokenCache: ICancelTokenCache = {
-        player: undefined,
-        system: undefined
-    };
-
     private cancelTokens: object = {};
 
     public getToken;
 
     private authType;
 
+    private abortController;
+
     public init(baseURL: string, credentials: any, organizationId?: string): void {
         // JWT
         const headers = {
@@ -229,12 +220,17 @@ export default class API {
 
         this.getToken = credentials;
         this.awsHttp = axios.create();
+        this.abortController = new AbortController();
+    }
+
+    public cancelAllPendingRequests() {
+        this.abortController.abort();
+        this.abortController = new AbortController();
     }
 
     private doRequest = async (
         config: AxiosRequestConfig,
-        organizationId?: string,
-        reqAlias: string = ''
+        organizationId?: string
     ): Promise<any> => {
         if (this.authType === API_AUTH_TYPES.TOKEN) {
             const token = await this.getToken();
@@ -249,19 +245,14 @@ export default class API {
             config.headers = headers;
         }
 
+        config.signal = this.abortController.signal;
+
         return new Promise((resolve, reject) => {
             this.http(config)
                 .then((res: AxiosResponse) => {
-                    if (reqAlias) {
-                        this.clearCache(reqAlias);
-                    }
-
                     resolve(res.data);
                 })
                 .catch((e: AxiosError) => {
-                    if (!axios.isCancel(e) && reqAlias) {
-                        this.clearCache(reqAlias);
-                    }
                     reject(e);
                 });
         });
@@ -286,22 +277,7 @@ export default class API {
         });
     };
 
-    private cancelPrevious = (reqAlias: string): CancelToken => {
-        const source: CancelTokenSource = axios.CancelToken.source();
-
-        if (this.cancelTokenCache[reqAlias]) {
-            this.cancelTokenCache[reqAlias].cancel();
-        }
-        this.cancelTokenCache[reqAlias] = source;
-
-        return source.token;
-    };
-
-    private clearCache = (reqAlias: string): void => {
-        this.cancelTokenCache[reqAlias] = undefined;
-    };
-
-    private doAWSRequest = (config: AxiosRequestConfig, reqAlias: string = ''): Promise<any> => {
+    private doAWSRequest = (config: AxiosRequestConfig): Promise<any> => {
         return new Promise((resolve, reject) => {
             this.awsHttp(config)
                 .then((res: AxiosResponse) => {
@@ -514,10 +490,6 @@ export default class API {
         return source.token;
     };
 
-    private clearCancelTokes = () => {
-        this.cancelTokens = {};
-    };
-
     public uploadAsset = (
         storyId: string,
         tags: string,
@@ -1454,41 +1426,6 @@ export default class API {
         });
     };
 
-    public getPlayerMetrics = (
-        storyId: string,
-        start: number,
-        end: number,
-        alias: string = 'player'
-    ): Promise<any> => {
-        const token = this.cancelPrevious(alias);
-        const config: AxiosRequestConfig = {
-            method: 'GET',
-            url: `/metrics/player/${storyId}`,
-            params: { start, end },
-            cancelToken: token
-        };
-
-        return this.doRequest(config, alias);
-    };
-
-    public getSystemMetrics = (
-        storyId: string,
-        start: number,
-        end: number,
-        step: number,
-        alias: string = 'system'
-    ): Promise<any> => {
-        const token = this.cancelPrevious(alias);
-        const config: AxiosRequestConfig = {
-            method: 'GET',
-            url: `/metrics/system/${storyId}`,
-            params: { start, end, step },
-            cancelToken: token
-        };
-
-        return this.doRequest(config, alias);
-    };
-
     public getOrganizations = (page: number, itemsPerPage: number): Promise<any[]> => {
         return this.doRequest({
             url: '/account',

package/src/utils/modal.ts

@@ -1,7 +1,19 @@
 import { IConfirmModalProps } from '../components/confirm-modal/ConfirmModal';
+import { IReplaceFilesModalProps } from '../components/replace-files-modal/ReplaceFilesModal';
+
+export const replaceFilesModalEvent = 'openreplacefilesmodal';
+export const confirmModalEvent = 'openconfirmmodal';
 
 export const openConfirmModal = (detail: IConfirmModalProps) => {
-    const event = new CustomEvent('openconfirmmodal', {
+    const event = new CustomEvent(confirmModalEvent, {
+        detail
+    });
+
+    window.dispatchEvent(event);
+};
+
+export const openReplaceFilesModal = (detail: IReplaceFilesModalProps) => {
+    const event = new CustomEvent(replaceFilesModalEvent, {
         detail
     });