@imposium-hub/components 2.9.0-14 → 2.9.0-3

package/src/redux/actions/asset-uploads.ts

@@ -4,7 +4,6 @@ import axios from 'axios';
 
 const assetUploadsActions: any = {
     ADD_UPLOAD: 'assetUploads/ADD_UPLOAD',
-    UPDATE_APPLY_ALL: 'assetUploads/UPDATE_APPY_ALL',
     UPDATE_UPLOAD: 'assetUploads/UPDATE_UPLOAD',
     UPDATE_PERCENT_UPLOADED: 'assetUploads/UPDATE_PERCENT_UPLOADED',
     ADD_UPLOAD_ASSET_ID: 'assetUploads/ADD_UPLOAD_ASSET_ID',
@@ -17,35 +16,6 @@ const POLL_INTERVAL: number = 5000;
 let uploadFiles: File[] = [];
 let setBindToOverlay;
 
-const getUploadMeta = (filename, file, editor) => {
-    const {
-        assetUploads: { tagByFileName, tagByDelimiter, delimiter, tagManually, manualTags }
-    } = editor;
-
-    let tags = [];
-    let assetId;
-
-    const name = file.name.slice(0, file.name.lastIndexOf('.'));
-
-    if (file.assetId) {
-        assetId = file.assetId;
-    } else {
-        if (tagByFileName) {
-            tags = tags.concat(name);
-        }
-
-        if (tagByDelimiter) {
-            const tag = name.split(delimiter);
-            tags = [...new Set([...tags, ...tag])];
-        }
-
-        if (tagManually) {
-            tags = [...new Set([...tags, ...manualTags])];
-        }
-    }
-    return { filename, percent: 0, tags, assetId };
-};
-
 export const uploadAssets = (
     api: IImposiumAPI,
     files: File[],
@@ -54,14 +24,17 @@ export const uploadAssets = (
     return (dispatch, getStore) => {
         const {
             assetUploads: { uploads },
-            editor,
-            editor: { showUploadsMenu, showUploadsDropdown }
+            editor: {
+                showUploadsMenu,
+                showUploadsDropdown,
+                assetUploads: { tagByFileName, tagByDelimiter, delimiter, tagManually, manualTags }
+            }
         } = getStore();
 
         uploadFiles.push(...files);
         setBindToOverlay = bindToOverlay;
 
-        files.map((file: any) => {
+        files.map((file: File) => {
             const uploadsWithSameName: any[] = uploads.filter((u: any) =>
                 u.filename.includes(file.name)
             );
@@ -70,7 +43,22 @@ export const uploadAssets = (
                     ? `${file.name} (${uploadsWithSameName.length})`
                     : file.name;
 
-            const uploadMeta: any = getUploadMeta(filename, file, editor);
+            let tags = [];
+
+            if (tagByFileName) {
+                tags = tags.concat(file.name.slice(0, file.name.lastIndexOf('.')));
+            }
+
+            if (tagByDelimiter) {
+                const tag = file.name.slice(0, file.name.lastIndexOf('.')).split(delimiter);
+                tags = [...new Set([...tags, ...tag])];
+            }
+
+            if (tagManually) {
+                tags = [...new Set([...tags, ...manualTags])];
+            }
+
+            const uploadMeta: any = { filename, percent: 0, tags };
 
             dispatch({ type: assetUploadsActions.ADD_UPLOAD, uploadMeta });
         });
@@ -83,13 +71,38 @@ export const uploadAssets = (
 
 export const updateUploadTags = (): any => {
     return (dispatch, getStore) => {
-        const { editor } = getStore();
+        const {
+            editor: {
+                assetUploads: { tagByFileName, tagByDelimiter, delimiter, tagManually, manualTags }
+            }
+        } = getStore();
         const uploadMetaArray = [];
 
         if (uploadFiles.length > 0) {
-            uploadFiles.map((file: any) => {
+            uploadFiles.map((file: File) => {
                 const filename: string = file.name;
-                const uploadMeta: any = getUploadMeta(filename, file, editor);
+
+                let tags = [];
+
+                if (tagByFileName) {
+                    const tagsByFileName = tags.concat(
+                        file.name.slice(0, file.name.lastIndexOf('.'))
+                    );
+                    const trimmedTags = tagsByFileName.map((str) => str.trim());
+                    tags = [...new Set([...tags, ...trimmedTags])];
+                }
+
+                if (tagByDelimiter) {
+                    const tag = file.name.slice(0, file.name.lastIndexOf('.')).split(delimiter);
+                    const trimmedTags = tag.map((str) => str.trim());
+                    tags = [...new Set([...tags, ...trimmedTags])];
+                }
+
+                if (tagManually) {
+                    tags = [...new Set([...tags, ...manualTags])];
+                }
+
+                const uploadMeta: any = { filename, percent: 0, tags };
 
                 uploadMetaArray.push(uploadMeta);
             });
@@ -108,10 +121,16 @@ export const uploadingAsset = (api: IImposiumAPI): any => {
 const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
     const {
         project: { storyId },
-        editor,
         editor: {
             fromCrM,
-            assetUploads: { assignToStory }
+            assetUploads: {
+                assignToStory,
+                tagByFileName,
+                tagByDelimiter,
+                delimiter,
+                tagManually,
+                manualTags
+            }
         },
         assetUploads: { uploads }
     } = getStore();
@@ -123,9 +142,27 @@ const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
     const sId = (assignToStory || fromCrM) && storyId ? storyId : null;
 
     if (uploadFiles.length > 0) {
-        const uploadBlobs: any[] = uploadFiles.map((file: any) => {
+        const uploadBlobs: any[] = uploadFiles.map((file: File) => {
             const filename: string = file.name;
 
+            let tags = [];
+
+            if (tagByFileName) {
+                const tagsByFileName = tags.concat(file.name.slice(0, file.name.lastIndexOf('.')));
+                const trimmedTags = tagsByFileName.map((str) => str.trim());
+                tags = [...new Set([...tags, ...trimmedTags])];
+            }
+
+            if (tagByDelimiter) {
+                const tag = file.name.slice(0, file.name.lastIndexOf('.')).split(delimiter);
+                const trimmedTags = tag.map((str) => str.trim());
+                tags = [...new Set([...tags, ...trimmedTags])];
+            }
+
+            if (tagManually) {
+                tags = [...new Set([...tags, ...manualTags])];
+            }
+
             const onUploadProgress = (progress: any): void => {
                 dispatch({
                     type: assetUploadsActions.UPDATE_PERCENT_UPLOADED,
@@ -135,12 +172,10 @@ const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
                 });
             };
 
-            const uploadMeta: any = getUploadMeta(filename, file, editor);
+            const uploadMeta: any = { filename, percent: 0, tags };
 
             uploadMetaArray.push(uploadMeta);
 
-            const { tags } = uploadMeta;
-
             return { file, tags, filename, onUploadProgress };
         });
 
@@ -154,155 +189,79 @@ const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
             const isUploading =
                 uploads.find((f) => f.filename === uploadBlobs[activeIndex].filename)?.percent > 0;
             if (!isUploading) {
-                if (uploadBlobs[activeIndex].file.assetId) {
-                    api.replaceAsset(
-                        uploadBlobs[activeIndex].file.assetId,
-                        uploadBlobs[activeIndex].file,
-                        uploadBlobs[activeIndex].onUploadProgress,
-                        uploadBlobs[activeIndex].filename
-                    )
-                        .then((result) => {
-                            const filename = uploadBlobs.find((b) =>
-                                b.filename.includes(result.name)
-                            ).filename;
-
-                            uploadFiles = uploadFiles.filter((f) => f.name !== filename);
-                            dispatch({
-                                type: assetUploadsActions.ADD_UPLOAD_ASSET_ID,
-                                assetId: result.id,
-                                filename
-                            });
-                            const currentOngoingJobs = () => {
-                                if (setBindToOverlay) {
-                                    setBindToOverlay(result);
+                api.uploadAsset(
+                    sId,
+                    uploadBlobs[activeIndex].tags,
+                    uploadBlobs[activeIndex].file,
+                    uploadBlobs[activeIndex].onUploadProgress,
+                    uploadBlobs[activeIndex].filename
+                )
+                    .then((result) => {
+                        const filename = uploadBlobs.find((b) =>
+                            b.filename.includes(result[0].name)
+                        ).filename;
+                        uploadFiles = uploadFiles.filter((f) => f.name !== filename);
+                        dispatch({
+                            type: assetUploadsActions.ADD_UPLOAD_ASSET_ID,
+                            assetId: result[0].id,
+                            filename
+                        });
+                        const currentOngoingJobs = () => {
+                            if (setBindToOverlay) {
+                                setBindToOverlay(result[0]);
+                            }
+                            return {
+                                footageId: result[0].id,
+                                jobId: result[0].job_id,
+                                filename: uploadBlobs[activeIndex].filename,
+                                onProcessed: () => {
+                                    const fileName = ongoingJobs.filter(
+                                        (job: any) => job.jobId === result[0].job_id
+                                    )[0].filename;
+                                    dispatch({
+                                        type: assetUploadsActions.REMOVE_UPLOAD,
+                                        filename: fileName
+                                    });
+                                    doAssetTableHydration(api, storyId);
                                 }
-                                return {
-                                    footageId: result.id,
-                                    jobId: result.job_id,
-                                    filename: uploadBlobs[activeIndex].filename,
-                                    onProcessed: () => {
-                                        const fileName = ongoingJobs.filter(
-                                            (job: any) => job.jobId === result.job_id
-                                        )[0].filename;
-                                        dispatch({
-                                            type: assetUploadsActions.REMOVE_UPLOAD,
-                                            filename: fileName
-                                        });
-                                        doAssetTableHydration(api, storyId);
-                                    }
-                                };
                             };
-                            ongoingJobs.push(currentOngoingJobs());
-                            if (currentQueue !== queueLength - 1) {
-                                currentQueue = currentQueue + 1;
-                                createPromise(currentQueue);
-                            } else {
-                                ongoingJobs = ongoingJobs.filter((j: any, i: number) => {
-                                    const jobIdExists: boolean = typeof j.jobId === 'string';
-                                    if (!jobIdExists) {
-                                        dispatch({
-                                            type: assetUploadsActions.REMOVE_UPLOAD,
-                                            filename: j.filename
-                                        });
-                                        doAssetTableHydration(api, storyId);
-                                    }
-                                    return jobIdExists;
-                                });
-                                if (ongoingJobs.length > 0) {
-                                    pollAssetJobs(api, ongoingJobs, processingTimeout);
+                        };
+                        ongoingJobs.push(currentOngoingJobs());
+                        if (currentQueue !== queueLength - 1) {
+                            currentQueue = currentQueue + 1;
+                            createPromise(currentQueue);
+                        } else {
+                            ongoingJobs = ongoingJobs.filter((j: any, i: number) => {
+                                const jobIdExists: boolean = typeof j.jobId === 'string';
+                                if (!jobIdExists) {
+                                    dispatch({
+                                        type: assetUploadsActions.REMOVE_UPLOAD,
+                                        filename: j.filename
+                                    });
+                                    doAssetTableHydration(api, storyId);
                                 }
+                                return jobIdExists;
+                            });
+                            if (ongoingJobs.length > 0) {
+                                pollAssetJobs(api, ongoingJobs, processingTimeout);
                             }
-                        })
-                        .catch((e: Error[]) => {
-                            if (axios.isCancel(e) && currentQueue !== queueLength - 1) {
-                                currentQueue = currentQueue + 1;
-                                createPromise(currentQueue);
-                            } else {
-                                const error: any = { ...e };
-                                const errorMsg = error.response.data.error.split(':')[0];
-                                dispatch({
-                                    type: assetUploadsActions.ERROR,
-                                    filename: uploadBlobs[activeIndex].filename,
-                                    errorMsg
-                                });
-                                doAssetTableHydration(api, storyId);
-                            }
-                        });
-                } else {
-                    api.uploadAsset(
-                        sId,
-                        uploadBlobs[activeIndex].tags,
-                        uploadBlobs[activeIndex].file,
-                        uploadBlobs[activeIndex].onUploadProgress,
-                        uploadBlobs[activeIndex].filename
-                    )
-                        .then((result) => {
-                            const filename = uploadBlobs.find((b) =>
-                                b.filename.includes(result[0].name)
-                            ).filename;
-                            uploadFiles = uploadFiles.filter((f) => f.name !== filename);
+                        }
+                    })
+                    .catch((e: Error[]) => {
+                        if (axios.isCancel(e) && currentQueue !== queueLength - 1) {
+                            currentQueue = currentQueue + 1;
+                            createPromise(currentQueue);
+                        } else {
+                            const error: any = { ...e };
+                            const errorMsg = error.response.data.error.split(':')[0];
                             dispatch({
-                                type: assetUploadsActions.ADD_UPLOAD_ASSET_ID,
-                                assetId: result[0].id,
-                                filename
+                                type: assetUploadsActions.ERROR,
+                                filename: uploadBlobs[activeIndex].filename,
+                                errorMsg
                             });
-                            const currentOngoingJobs = () => {
-                                if (setBindToOverlay) {
-                                    setBindToOverlay(result[0]);
-                                }
-                                return {
-                                    footageId: result[0].id,
-                                    jobId: result[0].job_id,
-                                    filename: uploadBlobs[activeIndex].filename,
-                                    onProcessed: () => {
-                                        const fileName = ongoingJobs.filter(
-                                            (job: any) => job.jobId === result[0].job_id
-                                        )[0].filename;
-                                        dispatch({
-                                            type: assetUploadsActions.REMOVE_UPLOAD,
-                                            filename: fileName
-                                        });
-                                        doAssetTableHydration(api, storyId);
-                                    }
-                                };
-                            };
-                            ongoingJobs.push(currentOngoingJobs());
-                            if (currentQueue !== queueLength - 1) {
-                                currentQueue = currentQueue + 1;
-                                createPromise(currentQueue);
-                            } else {
-                                ongoingJobs = ongoingJobs.filter((j: any, i: number) => {
-                                    const jobIdExists: boolean = typeof j.jobId === 'string';
-                                    if (!jobIdExists) {
-                                        dispatch({
-                                            type: assetUploadsActions.REMOVE_UPLOAD,
-                                            filename: j.filename
-                                        });
-                                        doAssetTableHydration(api, storyId);
-                                    }
-                                    return jobIdExists;
-                                });
-                                if (ongoingJobs.length > 0) {
-                                    pollAssetJobs(api, ongoingJobs, processingTimeout);
-                                }
-                            }
-                        })
-                        .catch((e: Error[]) => {
-                            if (axios.isCancel(e) && currentQueue !== queueLength - 1) {
-                                currentQueue = currentQueue + 1;
-                                createPromise(currentQueue);
-                            } else {
-                                const error: any = { ...e };
-                                const errorMsg = error.response.data.error.split(':')[0];
-                                dispatch({
-                                    type: assetUploadsActions.ERROR,
-                                    filename: uploadBlobs[activeIndex].filename,
-                                    errorMsg
-                                });
-                                doAssetTableHydration(api, storyId);
-                            }
-                        });
-                }
+                            doAssetTableHydration(api, storyId);
+                        }
+                    });
             }
         };
 
@@ -315,39 +274,49 @@ const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
 
 export const replaceAsset = (
     api: IImposiumAPI,
+    assetId: any,
     files: File[],
     storyId: string,
-    assetId?: any,
     bindToOverlay?: (f: any) => any
 ): any => {
-    return (dispatch) => {
+    return (dispatch, getStore) => {
         return new Promise<void>((resolve) => {
+            const {
+                assetUploads: { uploads }
+            } = getStore();
             let currentQueue: number = 0;
             let ongoingJobs: any[] = [];
             const filesLength = files.length > 5 ? 4 : files.length - 1;
 
             const replacedFileBlobs: any[] = files.map((file: File) => {
-                const uploadMeta: any = { filename: file.name, percent: 0 };
+                const uploadsWithSameName: any[] = uploads.filter((u: any) =>
+                    u.filename.includes(file.name)
+                );
+                const filename: string =
+                    uploadsWithSameName.length > 0
+                        ? `${file.name} (${uploadsWithSameName.length})`
+                        : file.name;
+
+                const uploadMeta: any = { filename, percent: 0 };
 
                 const onUploadProgress = (progress: any): void => {
                     dispatch({
                         type: assetUploadsActions.UPDATE_PERCENT_UPLOADED,
                         percent: Math.floor((progress.loaded * 100) / progress.total),
-                        filename: file.name
+                        filename
                     });
                 };
 
                 dispatch({ type: assetUploadsActions.ADD_UPLOAD, uploadMeta });
 
-                return { file, filename: file.name, onUploadProgress };
+                return { file, filename, onUploadProgress };
             });
 
             const createPromise = (activeIndex: number) => {
                 const queueLength: number = replacedFileBlobs.length;
                 const processingTimeout: number = -1;
-                const id = assetId ? assetId : replacedFileBlobs[activeIndex].file.assetId;
                 api.replaceAsset(
-                    id,
+                    assetId,
                     replacedFileBlobs[activeIndex].file,
                     replacedFileBlobs[activeIndex].onUploadProgress,
                     replacedFileBlobs[activeIndex].filename

package/src/redux/actions/publish.ts

@@ -17,7 +17,7 @@ export const getStoryPublishStatus = (api: IImposiumAPI, storyId: string): any =
                         }
 
                         dispatch({ type: publish.UPDATE_PUBLISH_STATUS, data: resStatus });
-
+                        resolve(resStatus);
                         if (resStatus.publishing) {
                             const jobId = resStatus.job_id;
                             api.pollJob(jobId)
@@ -38,14 +38,12 @@ export const getStoryPublishStatus = (api: IImposiumAPI, storyId: string): any =
                                         reject(copy.header.publishPollError);
                                     }
                                 });
-                        } else {
-                            resolve(resStatus);
                         }
                     }
                 })
                 .catch((e) => {
                     // 404 = no published version = using working copy
-                    if (e?.response?.status !== 404 && e.error !== 'missing_refresh_token') {
+                    if (e?.response?.status !== 404) {
                         console.error(e);
                         reject(copy.header.publishPollError);
                     }
@@ -79,15 +77,9 @@ export const publishVersion = (api: IImposiumAPI, storyId: string) => {
         return new Promise((resolve, reject) => {
             api.runPublish(storyId, '')
                 .then((d) => {
-                    dispatch(getStoryPublishStatus(api, storyId))
-                        .then()
-                        .catch((error) => {
-                            dispatch({ type: publish.CLEAR_PUBLISH_STATUS });
-                            reject(error);
-                        });
+                    return dispatch(getStoryPublishStatus(api, storyId));
                 })
                 .catch((e) => {
-                    dispatch({ type: publish.CLEAR_PUBLISH_STATUS });
                     if (e) {
                         reject(e);
                     } else {

package/src/redux/reducers/asset-uploads.ts

@@ -1,8 +1,7 @@
 import assetUploadsActions from '../actions/asset-uploads';
 
 const initialState: any = {
-    uploads: [],
-    applyAll: false
+    uploads: []
 };
 
 const assetUploads = (state = initialState, action): any => {

package/src/services/API.ts

@@ -146,7 +146,7 @@ export interface IImposiumAPI {
     getAssetMap(storyId: string);
     clearStoryCache(storyId: string);
     debugId(id: string);
-    cacheActiveStory(serviceId: any, orgId: string, storyId?: string);
+    cacheActiveStory(serviceId: any, orgId: string, storyId: string);
     getCachedStoryForOrg(serviceId: string, orgId: string);
     getAccessData(includeTotalRenders?: boolean, orgId?: string);
     deleteExperience(experienceId: string, eraseMedia?: boolean);
@@ -1655,21 +1655,16 @@ export default class API {
         });
     };
 
-    public cacheActiveStory = (serviceId, orgId, storyId?): Promise<any | Error> => {
+    public cacheActiveStory = (serviceId, orgId, storyId): Promise<any | Error> => {
         const route = `/service/${serviceId}/${orgId}/active`;
 
-        const data: any = {
-            organization_id: orgId
-        };
-
-        if (storyId) {
-            data['story_id'] = storyId;
-        }
-
         return this.doRequest({
             method: 'POST',
             url: route,
-            data
+            data: {
+                story_id: storyId,
+                organization_id: orgId
+            }
         });
     };
 

package/src/utils/modal.ts

@@ -1,9 +1,7 @@
 import { IConfirmModalProps } from '../components/confirm-modal/ConfirmModal';
 
-export const confirmModalEvent = 'openconfirmmodal';
-
 export const openConfirmModal = (detail: IConfirmModalProps) => {
-    const event = new CustomEvent(confirmModalEvent, {
+    const event = new CustomEvent('openconfirmmodal', {
         detail
     });
 

package/dist/cjs/components/edit-guide-modal/EditGuideModal.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-export interface IEditGuideModalProps {
-    guide: number;
-    onClose: () => any;
-    onContinue: (e: any) => any;
-    isHorizontal: boolean;
-}
-export declare const EditGuideModal: () => React.JSX.Element;