@imposium-hub/components 2.4.0-3 → 2.4.0-5

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

@@ -1,63 +1,20 @@
 import assetUploadsActions from '../actions/asset-uploads';
 
 const initialState: any = {
-    tagByDelimiter: true,
-    delimiter: '_',
-    tagManually: false,
-    manualTags: [],
-    tagByFileName: false,
-    assignToStory: true,
     uploads: []
 };
 
 const assetUploads = (state = initialState, action): any => {
     switch (action.type) {
-        case assetUploadsActions.TOGGLE_TAG_BY_FILENAME:
-            return {
-                ...state,
-                tagByFileName: action.toggle
-            };
-        case assetUploadsActions.TOGGLE_TAG_BY_DELIMITER:
-            return {
-                ...state,
-                tagByDelimiter: action.toggle
-            };
-        case assetUploadsActions.SET_DELIMITER:
-            return {
-                ...state,
-                delimiter: action.delimiter
-            };
-        case assetUploadsActions.TOGGLE_MANUAL_TAGGING:
-            return {
-                ...state,
-                tagManually: action.toggle
-            };
-        case assetUploadsActions.ADD_MANUAL_TAG:
-            const newManualTags = [...state.manualTags];
-            newManualTags.push(action.tag);
-            return {
-                ...state,
-                manualTags: newManualTags
-            };
-        case assetUploadsActions.DELETE_MANUAL_TAG:
-            return {
-                ...state,
-                manualTags: state.manualTags.filter((t: string) => t !== action.tag)
-            };
-        case assetUploadsActions.DELETE_MANUAL_TAGS:
-            return {
-                ...state,
-                manualTags: []
-            };
-        case assetUploadsActions.TOGGLE_ASSIGN_TO_STORY:
+        case assetUploadsActions.ADD_UPLOAD:
             return {
                 ...state,
-                assignToStory: action.toggle
+                uploads: [...state.uploads, action.uploadMeta]
             };
-        case assetUploadsActions.ADD_UPLOAD:
+        case assetUploadsActions.UPDATE_UPLOAD:
             return {
                 ...state,
-                uploads: [...state.uploads, action.uploadMeta]
+                uploads: action.uploadMetaArray
             };
         case assetUploadsActions.UPDATE_PERCENT_UPLOADED:
             const newUploads = state.uploads.map((u: any) => {
@@ -72,6 +29,19 @@ const assetUploads = (state = initialState, action): any => {
                 ...state,
                 uploads: newUploads
             };
+        case assetUploadsActions.ADD_UPLOAD_ASSET_ID:
+            const updateUploads = state.uploads.map((u: any) => {
+                if (u.filename === action.filename) {
+                    return { ...u, assetId: action.assetId };
+                }
+
+                return u;
+            });
+
+            return {
+                ...state,
+                uploads: updateUploads
+            };
         case assetUploadsActions.REMOVE_UPLOAD:
             return {
                 ...state,

package/src/services/API.ts

@@ -123,7 +123,7 @@ export interface IImposiumAPI {
     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);
+    addOrganization(orgName: string, enableCloudfront: boolean, defaultStory?: string);
     cancelExperiencePolling();
     createCompositionAsset(
         storyId: string,
@@ -1033,7 +1033,7 @@ export default class API {
                 } = res;
 
                 if (status === 'failed') {
-                    reject();
+                    reject(res?.data?.error || null);
                 } else if (output !== undefined) {
                     resolve(res.data);
                 } else {
@@ -1430,12 +1430,17 @@ export default class API {
         });
     };
 
-    public addOrganization = (orgName: string, defaultStory?: string): Promise<any> => {
+    public addOrganization = (
+        orgName: string,
+        enableCloudfront: boolean,
+        defaultStory?: string
+    ): Promise<any> => {
         return this.doRequest({
             url: '/account',
             method: 'POST',
             data: {
                 name: orgName,
+                enable_cloudfront: enableCloudfront,
                 initial_story: defaultStory
             }
         });

package/src/utils/assets.ts

@@ -1,12 +1,11 @@
 import { HEADER_HEIGHT, PREVIEW_MAX_HEIGHT, PREVIEW_MAX_WIDTH } from '../constants/assets';
-import { CSSProperties } from 'react';
 
 export const getMediaPreviewStyle = (
     mediaWidth: number,
     mediaHeight: number,
     element: any,
     offsetY: number = 0
-): CSSProperties => {
+): React.CSSProperties => {
     if (!element) {
         return;
     }