@imposium-hub/components 2.2.44-7 → 2.2.44

package/src/components/header/Header.tsx

@@ -21,7 +21,6 @@ export interface IHeaderProps {
     auth: any;
     story: any;
     baseUrl: any;
-    access: any;
 }
 
 export interface IHeaderState {
@@ -161,7 +160,7 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
 
     public componentDidUpdate(prevProps: Readonly<IHeaderProps>): void {
         const { accessData } = this.state;
-        const { activeOrganization, access } = this.props;
+        const { activeOrganization } = this.props;
 
         if (activeOrganization !== prevProps.activeOrganization) {
             if (accessData !== null) {
@@ -170,12 +169,6 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
                 this.getAccessDataHandler();
             }
         }
-
-        if (!_.isEqual(access, accessData)) {
-            this.setState({ accessData: access }, () =>
-                this.parseAccessData(access, activeOrganization)
-            );
-        }
     }
 
     private parseAccessData = (accessData: any, activeOrganization: string): void => {
@@ -306,6 +299,7 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
 
         this.setState({ dataLoading: true });
 
+        // SessionService.getAccessData(idToken, baseUrl, true, activeOrganization)
         SessionService.getAccessData(idToken, baseUrl)
             .then((res) => {
                 this.setState({ dataLoading: false, accessData: res }, () =>
@@ -480,11 +474,7 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
                         });
                     }}>
                     <div className='story-name'>
-                        {currentStory
-                            ? currentStory.name
-                            : story
-                            ? story.name
-                            : 'Project Not Found'}
+                        {currentStory ? currentStory.name : story ? story.name : ''}
                     </div>
                     {this.renderDropdownChevron(showStoriesDropdown)}
                 </button>
@@ -610,8 +600,7 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
 const mapStateToProps = (state): any => {
     return {
         auth: state.auth,
-        story: state.story,
-        access: state.access
+        story: state.story
     };
 };
 

package/src/components/list-field/ListField.tsx

@@ -10,7 +10,7 @@ import { ICON_PLUS } from '../../constants/icons';
 interface IListFieldProps {
     buttons?: any;
     disabled?: boolean;
-    label?: any;
+    label?: string;
     options: any;
     placeholder?: string;
     tooltip?: IToolTipConfig | string;

package/src/components/number-field/NumberField.tsx

@@ -4,7 +4,7 @@ import { IToolTipConfig } from '../Tooltip';
 
 interface INumberFieldProps {
     buttons?: any;
-    label?: any;
+    label?: string;
     placeholder?: string;
     readOnly?: boolean;
     value: number;

package/src/components/publish-wizard/PublishWizard.tsx

@@ -25,6 +25,7 @@ import { connect } from 'react-redux';
 interface IPublishWizardProps {
     story: any;
     project: any;
+    updateEditorConfig(c): void;
     editor: any;
     updateScene(d): void;
     editStory(s): void;
@@ -66,7 +67,6 @@ interface IPublishWizardProps {
     renderBatch: (batchId: string, postRenderActions?: any) => any;
     publishData: any;
     onDeleteBatch?: (batchId: string) => any;
-    onBackBtn?: () => void;
 }
 
 export interface ICredential {
@@ -350,20 +350,13 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                     size={'large'}
                     key='btn-back'
                     onClick={() =>
-                        this.setState(
-                            {
-                                screenIndex: backIndex,
-                                next: false,
-                                nextStep: false,
-                                error: false,
-                                done: false
-                            },
-                            () => {
-                                if (this.props.onBackBtn) {
-                                    this.props.onBackBtn();
-                                }
-                            }
-                        )
+                        this.setState({
+                            screenIndex: backIndex,
+                            next: false,
+                            nextStep: false,
+                            error: false,
+                            done: false
+                        })
                     }
                     color='primary'>
                     {copy.publish.btnBack}

package/src/components/publish-wizard/publish/EmailWorkflow.tsx

@@ -488,7 +488,12 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
     }
 
     public renderLabel() {
-        const { isExport, batchJobs, publishDataset } = this.props;
+        const {
+            isExport,
+            batchJobs,
+            publishDataset,
+            batchesList: { error }
+        } = this.props;
         const { renderedBatch, selectedBatchId, uploading, uploadComplete } = this.state;
 
         if (
@@ -507,6 +512,10 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
             );
         }
 
+        if (batchJobs.failed && error[selectedBatchId]) {
+            return <>{error[selectedBatchId].error}</>;
+        }
+
         if (uploading) {
             const uploadingCopy = isExport
                 ? copy.publish.importingData
@@ -661,14 +670,9 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
             batchError,
             creativeManagerOverrides
         } = this.state;
-
         const {
             isExport,
             batchJobs: { missing, renders, failed },
-            batchesList: {
-                error,
-                selected: { name }
-            },
             isCrM,
             publishDataset
         } = this.props;
@@ -772,49 +776,13 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
         const title = publishDataset
             ? copy.publish.datasetTitle.replace('[dataset_name]', this.props.activeDataset?.name)
             : copy.publish.emailTitle;
-
         const desc = publishDataset ? '' : copy.publish.emailDesc;
 
-        const showBatchError = () => {
-            if (failed && error[selectedBatchId]) {
-                let errorMsg: JSX.Element = <></>;
-                let errorExpMsg: JSX.Element = <></>;
-                if (error[selectedBatchId]) {
-                    const { experience } = error[selectedBatchId];
-                    errorMsg = <span className='error-title'>{error[selectedBatchId].error}</span>;
-                    errorExpMsg = experience?.error ? <div>{experience.error}</div> : <></>;
-                }
-
-                return (
-                    <div className='batch-job-error'>
-                        <h2>{`Batch "${name}" stopped due to errors.`}</h2>
-                        <table>
-                            <thead></thead>
-                            <tbody>
-                                <tr>
-                                    <td>Batch ID:</td>
-                                    <td>{selectedBatchId}</td>
-                                </tr>
-                                <tr>
-                                    <td>First Error:</td>
-                                    <td>
-                                        {errorMsg}
-                                        <br />
-                                        {errorExpMsg}
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                );
-            }
-        };
         const uploadCSV = (
             <div>
                 <h2>{title}</h2>
                 <HRule />
                 <p>{desc}</p>
-                {showBatchError()}
                 <input
                     type='file'
                     style={{ display: 'none' }}

package/src/components/select-field/SelectField.tsx

@@ -7,7 +7,7 @@ import { copying } from '../../constants/copy';
 
 interface ISelectFieldProps {
     buttons?: any;
-    label?: any;
+    label?: string;
     selectRef?: any;
     options: any;
     disable?: boolean;
@@ -61,9 +61,6 @@ class SelectField extends React.PureComponent<ISelectFieldProps> {
         }
 
         this.props.onChange(val);
-        if (this.props.selectRef?.current) {
-            this.props.selectRef.current.blur();
-        }
     }
 
     public render() {

package/src/components/slider-field/SliderField.tsx

@@ -3,7 +3,7 @@ import FieldWrapper from '../field-wrapper/FieldWrapper';
 import { IToolTipConfig } from '../Tooltip';
 
 interface ISliderFieldProps {
-    label?: any;
+    label?: string;
     value: number;
     width?: string | number;
     min: number;

package/src/components/smpte-field/SMPTEField.tsx

@@ -5,7 +5,7 @@ import { TIMECODE } from '../../constants/timecode';
 import { getSMPTE } from '../../Util';
 
 interface ISMPTEFieldProps {
-    label?: any;
+    label?: string;
     placeholder?: string;
     readOnly?: boolean;
     tooltip?: IToolTipConfig | string;

package/src/components/story-previewer/StoryPreviewer.tsx

@@ -57,7 +57,6 @@ interface IStoryPreviewerState {
     isTimeOut: boolean;
     error: boolean;
     jobLogLoading: boolean;
-    errorMsg: string;
 }
 
 class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPreviewerState> {
@@ -87,8 +86,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
             isTimeOut: false,
             compositionOverride: null,
             error: false,
-            jobLogLoading: false,
-            errorMsg: ''
+            jobLogLoading: false
         };
 
         this.timer = new Timer({
@@ -193,8 +191,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
     public componentDidUpdate(prevProps, prevState) {
         if (!prevProps.editor?.autoRender && this.props.editor?.autoRender) {
             this.props.updateEditorConfig({ autoRender: false });
-            this.evtHandlers.gotExperience = null;
-            this.props.api.cancelExperiencePolling().then(() => this.createExperience());
+            this.createExperience();
         }
 
         if (
@@ -228,7 +225,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                 const { experienceId } = this.state;
 
                 api.cancelExperiencePolling().then(() => {
-                    onError(copy.runExpIdError.replace('[expId]', experienceId));
+                    onError(copy.runExpError.replace('[expId]', experienceId));
 
                     this.resetState(
                         true,
@@ -510,8 +507,8 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                                                                 () => {
                                                                     onError(
                                                                         copy.runExpError.replace(
-                                                                            '[error]',
-                                                                            e.error
+                                                                            '[expId]',
+                                                                            experienceId
                                                                         )
                                                                     );
 
@@ -519,8 +516,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                                                                         true,
                                                                         () => {
                                                                             this.setState({
-                                                                                isTimeOut: true,
-                                                                                errorMsg: e.error
+                                                                                isTimeOut: true
                                                                             });
                                                                         },
                                                                         experienceId
@@ -529,7 +525,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                                                             );
                                                         } else {
                                                             onError(
-                                                                copy.runExpIdError.replace(
+                                                                copy.runExpError.replace(
                                                                     '[expId]',
                                                                     experienceId
                                                                 )
@@ -573,10 +569,10 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                                     this.resetState();
                                     if (onError) {
                                         if (e.error) {
-                                            onError(copy.runExpError.replace('[error]', e.error));
+                                            onError(e.error);
                                         } else {
                                             onError(
-                                                copy.runExpIdError.replace('[expId]', experienceId)
+                                                copy.runExpError.replace('[expId]', experienceId)
                                             );
                                         }
                                     }
@@ -656,8 +652,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
     }
 
     private renderViewerContent() {
-        const { rendering, experience, timeElapsed, activeOutput, isTimeOut, errorMsg } =
-            this.state;
+        const { rendering, experience, timeElapsed, activeOutput, isTimeOut } = this.state;
 
         const { api, onError } = this.props;
 
@@ -681,8 +676,6 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                     <p>
                         {copy.time}&nbsp;{formattedTime(timeElapsed)}
                     </p>
-                    <br />
-                    <p>{`${copy.runExpError.replace('[error]', errorMsg)}`}</p>
                 </div>
             );
         } else if (experience && activeOutput) {

package/src/components/text-area-field/TextAreaField.tsx

@@ -9,7 +9,7 @@ interface ITextAreaFieldProps {
     buttons?: any;
     controlled?: boolean;
     disabled?: boolean;
-    label?: any;
+    label?: string;
     placeholder?: string;
     readOnly?: boolean;
     value: string;

package/src/components/text-field/TextField.tsx

@@ -23,7 +23,7 @@ interface ITextFieldProps {
     disabled?: boolean;
     submittable?: boolean;
     focusOnMount?: boolean;
-    label?: any;
+    label?: string;
     placeholder?: string;
     readOnly?: boolean;
     value?: string;

package/src/constants/copy.ts

@@ -1,7 +1,6 @@
 export const assets = {
     tooltipFilter: 'Filter by Asset type',
     previewNotAvailable: 'Preview Not Available for this Asset Type',
-    dropAsset: 'Drop file(s) here.',
     iconTypes: {
         filter: 'Filter By Type',
         lut: 'LUT',
@@ -18,15 +17,15 @@ export const assets = {
         after_effects: 'After Effects'
     },
     uploads: {
-        noUploads: 'No files selected, drag and drop files here to begin.',
+        noUploads: 'There are currently no assets uploading...',
         preparePhase: 'Preparing asset...',
         autoTagFilname: 'Tag by file name',
         autoTagDelimiter: 'Tag by Delimiter',
         delimiterOptions: 'Delimiter Options',
         manualTagging: 'Tag Manually',
-        assignToProjectInput: 'Make Global',
+        assignToProjectInput: 'Assign to Project',
         assignToProjectInfo:
-            'If selected, any assets uploaded will be available to use with all projects on the current organization.',
+            'If selected, any assets uploaded will only be available to use with the currently selected project.',
         uploadButton: 'Upload',
         cancelButton: 'Cancel'
     },
@@ -59,8 +58,7 @@ export const previewer = {
     time: 'Time Elapsed:',
     expRunning: 'Rendering Experience',
     runExpStart: 'Creating Experience',
-    runExpIdError: 'Error running experience - ID: [expId]',
-    runExpError: 'Error running experience: [error]',
+    runExpError: 'Error running experience - ID: [expId]',
     triggerExpError: 'Error triggering experience - ID: [expId]',
     expId: 'Running Experience - ID: [expId]',
     createExpError: 'Error creating experience',
@@ -77,7 +75,6 @@ export const previewer = {
 };
 
 export const compositions = {
-    tooltipPropId: 'Copy Property ID',
     name: 'Name',
     width: 'Width',
     height: 'Height',

package/src/index.ts

@@ -46,7 +46,6 @@ import AssetsTableTagsFilter from './components/assets/AssetsTableTagsFilter';
 import AssetsTableTagsPivot from './components/assets/AssetsTableTagsPivot';
 import AssetsTableComplexTagCell from './components/assets/AssetsTableComplexTagCell';
 import AssetsTableTypeCell from './components/assets/AssetsTableTypeCell';
-import AssetsTableGlobalCell from './components/assets/AssetsTableGlobalCell';
 import AssetsTableStatusCell from './components/assets/AssetsTableStatusCell';
 import AssetsTableTypeFilter from './components/assets/AssetsTableTypeFilter';
 import AssetsTypeIcon from './components/assets/AssetsTypeIcon';
@@ -104,7 +103,12 @@ import {
     updateAssetStory
 } from './redux/actions/asset-list';
 import { getAssetTagList, addAssetTagToList } from './redux/actions/asset-tags';
-import { cancelAssetUpload, uploadAssets, replaceAsset } from './redux/actions/asset-uploads';
+import {
+    cancelAssetUpload,
+    toggleTagFileName,
+    uploadAssets,
+    replaceAsset
+} from './redux/actions/asset-uploads';
 import { selectAsset, deselectAsset, resetSelection } from './redux/actions/selected-assets';
 import assetFilters from './redux/reducers/asset-filters';
 import assetList from './redux/reducers/asset-list';
@@ -156,7 +160,6 @@ import AssetsTableRateCell from './components/assets/AssetsTableRateCell';
 import ContextMenu from './components/context-menu/ContextMenu';
 import ContextMenuItem from './components/context-menu/ContextMenuItem';
 import ContextMenuTrigger from './components/context-menu/ContextMenuTrigger';
-import CopyPropIdButton from './components/copy-prop-id-button/CopyPropIdButton';
 import Submenu from './components/context-menu/SubMenu';
 
 export {
@@ -213,7 +216,6 @@ export {
     AssetsTableSelectCell,
     AssetsTableTypeFilter,
     AssetsTableTypeCell,
-    AssetsTableGlobalCell,
     AssetsTableStatusCell,
     AssetsTableNameFilter,
     AssetsTableNameCell,
@@ -249,6 +251,7 @@ export {
     updateAssetName,
     updateAssetData,
     doAssetTableHydration,
+    toggleTagFileName,
     uploadAssets,
     replaceAsset,
     selectAsset,
@@ -310,6 +313,5 @@ export {
     ContextMenu,
     ContextMenuItem,
     ContextMenuTrigger,
-    Submenu,
-    CopyPropIdButton
+    Submenu
 };