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

package/src/components/data-table/DataTable.tsx

@@ -265,7 +265,7 @@ const DataTable: React.FC<IDataTableProps> = (props: IDataTableProps) => {
                                                 {...column.getHeaderProps()}
                                                 className={`ip-table-header ${
                                                     column.canSort ? 'ip-sortable' : ''
-                                                }`}>
+                                                } ${column.pin ? 'pin' : ''}`}>
                                                 {!searchable && (
                                                     <div
                                                         {...toggleProps}
@@ -371,7 +371,7 @@ const DataTable: React.FC<IDataTableProps> = (props: IDataTableProps) => {
                                 {...cell.getCellProps()}
                                 className={`ip-table-col ${
                                     cell.column.overflowVisible ? 'overflow-visible' : ''
-                                }`.trim()}>
+                                } ${cell.column.pin ? 'pin' : ''}`.trim()}>
                                 {cell.render('Cell')}
                             </td>
                         ));

package/src/components/header/Header.tsx

@@ -91,14 +91,14 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
             minWidth: 115,
             disableSortBy: false
         },
-        // {
-        //     accessor: 'total_renders',
-        //     Header: 'Total Renders',
-        //     width: 60,
-        //     minWidth: 60,
-        //     maxWidth: 60,
-        //     disableSortBy: false
-        // },
+        {
+            accessor: 'total_renders',
+            Header: 'Total Renders',
+            width: 60,
+            minWidth: 60,
+            maxWidth: 60,
+            disableSortBy: false
+        },
         {
             accessor: 'last_modified_by',
             Header: 'Last Modified By',
@@ -304,7 +304,7 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
 
         this.setState({ dataLoading: true });
 
-        SessionService.getAccessData(accessToken, baseUrl, false, activeOrganization)
+        SessionService.getAccessData(accessToken, baseUrl, true, activeOrganization)
             .then((res) => {
                 this.setState({ dataLoading: false });
                 this.props.setAccessData(res);

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

@@ -10,7 +10,7 @@ import { ICON_PLUS } from '../../constants/icons';
 interface IListFieldProps {
     buttons?: any;
     disabled?: boolean;
-    label?: string;
+    label?: any;
     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?: string;
+    label?: any;
     placeholder?: string;
     readOnly?: boolean;
     value: number;

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

@@ -29,7 +29,6 @@ interface IPublishWizardProps {
     creativeManagerBaseUrl?: string;
     story: any;
     project: any;
-    updateEditorConfig(c): void;
     editor: any;
     updateScene(d): void;
     editStory(s): void;
@@ -70,6 +69,7 @@ interface IPublishWizardProps {
     renderBatch: (batchId: string, postRenderActions?: any) => any;
     publishData: any;
     onDeleteBatch?: (batchId: string) => any;
+    onBackBtn?: () => void;
 }
 
 export interface ICredential {
@@ -326,10 +326,21 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
         this.props.onClose();
     };
 
+    private shouldDisablePublishButtonForCrM() {
+        const { story, project, fromCrM } = this.props;
+        const variables = story ? story.acts[project.actId].inventory : {};
+        const varLength = variables ? Object.keys(variables).length : 0;
+
+        if (fromCrM && varLength === 0) {
+            return true;
+        }
+        return false;
+    }
+
     private renderLowerButtons() {
         const { screenIndex, done, error, next } = this.state;
         const { publishing } = this.props.publishData;
-
+        const disabledForCrM = this.shouldDisablePublishButtonForCrM();
         const lowerButtons = [];
 
         // publish and skip buttons
@@ -339,7 +350,7 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                 <Button
                     tooltip={copy.publish.btnPublish}
                     size={'large'}
-                    disabled={publishing}
+                    disabled={publishing || disabledForCrM}
                     key='btn-publish'
                     onClick={() => this.handlePublish()}
                     color='primary'>
@@ -382,13 +393,20 @@ 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
-                        })
+                        this.setState(
+                            {
+                                screenIndex: backIndex,
+                                next: false,
+                                nextStep: false,
+                                error: false,
+                                done: false
+                            },
+                            () => {
+                                if (this.props.onBackBtn) {
+                                    this.props.onBackBtn();
+                                }
+                            }
+                        )
                     }
                     color='primary'>
                     {copy.publish.btnBack}
@@ -416,10 +434,17 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
 
     private renderPublish() {
         const { publishing } = this.props.publishData;
+        const disabledForCrM = this.shouldDisablePublishButtonForCrM();
         const { publishError } = this.state;
-        const error = publishError ? (
+        const errorCopy = publishError
+            ? publishError
+            : disabledForCrM
+            ? copy.publish.noVariablesError
+            : null;
+
+        const error = errorCopy ? (
             <p className='publish-error'>
-                <span className='icon'>{ICON_EXCLAIMATION_TRIANGLE}</span>&nbsp;&nbsp;{publishError}
+                <span className='icon'>{ICON_EXCLAIMATION_TRIANGLE}</span>&nbsp;&nbsp;{errorCopy}
             </p>
         ) : null;
         return (
@@ -527,7 +552,7 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                               {ICON_UP_RIGHT_FROM_SQUARE}&nbsp;{copy.publish.btnCrM}
                           </span>
                       ),
-                      link: `${creativeManagerBaseUrl}/library/${story.creativeLibraryId}/creative/${story.creativeLibraryId}/versions/`
+                      link: `${creativeManagerBaseUrl}/library/${story.creativeLibraryId}/creative/${story.creativeId}/versions/`
                   }
               ];
 

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

@@ -488,12 +488,7 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
     }
 
     public renderLabel() {
-        const {
-            isExport,
-            batchJobs,
-            publishDataset,
-            batchesList: { error }
-        } = this.props;
+        const { isExport, batchJobs, publishDataset } = this.props;
         const { renderedBatch, selectedBatchId, uploading, uploadComplete } = this.state;
 
         if (
@@ -512,10 +507,6 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
             );
         }
 
-        if (batchJobs.failed && error[selectedBatchId]) {
-            return <>{error[selectedBatchId].error}</>;
-        }
-
         if (uploading) {
             const uploadingCopy = isExport
                 ? copy.publish.importingData
@@ -670,9 +661,14 @@ 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;
@@ -776,13 +772,49 @@ 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 && 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?: string;
+    label?: any;
     selectRef?: any;
     options: any;
     disable?: boolean;
@@ -61,6 +61,9 @@ 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?: string;
+    label?: any;
     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?: string;
+    label?: any;
     placeholder?: string;
     readOnly?: boolean;
     tooltip?: IToolTipConfig | string;

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

@@ -509,9 +509,9 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                                                             api.cancelExperiencePolling().then(
                                                                 () => {
                                                                     onError(
-                                                                        copy.runExpIdError.replace(
-                                                                            '[expId]',
-                                                                            experienceId
+                                                                        copy.runExpError.replace(
+                                                                            '[error]',
+                                                                            e.error
                                                                         )
                                                                     );
 
@@ -572,9 +572,13 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                                 .catch((e) => {
                                     this.resetState();
                                     if (onError) {
-                                        onError(
-                                            copy.runExpIdError.replace('[expId]', experienceId)
-                                        );
+                                        if (e.error) {
+                                            onError(copy.runExpError.replace('[error]', e.error));
+                                        } else {
+                                            onError(
+                                                copy.runExpIdError.replace('[expId]', experienceId)
+                                            );
+                                        }
                                     }
                                 });
                         }

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

@@ -9,7 +9,7 @@ interface ITextAreaFieldProps {
     buttons?: any;
     controlled?: boolean;
     disabled?: boolean;
-    label?: string;
+    label?: any;
     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?: string;
+    label?: any;
     placeholder?: string;
     readOnly?: boolean;
     value?: string;

package/src/constants/copy.ts

@@ -1,6 +1,7 @@
 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',
@@ -17,15 +18,15 @@ export const assets = {
         after_effects: 'After Effects'
     },
     uploads: {
-        noUploads: 'There are currently no assets uploading...',
+        noUploads: 'No files selected, drag and drop files here to begin.',
         preparePhase: 'Preparing asset...',
         autoTagFilname: 'Tag by file name',
         autoTagDelimiter: 'Tag by Delimiter',
         delimiterOptions: 'Delimiter Options',
         manualTagging: 'Tag Manually',
-        assignToProjectInput: 'Assign to Project',
+        assignToProjectInput: 'Make Global',
         assignToProjectInfo:
-            'If selected, any assets uploaded will only be available to use with the currently selected project.',
+            'If selected, any assets uploaded will be available to use with all projects on the current organization.',
         uploadButton: 'Upload',
         cancelButton: 'Cancel'
     },
@@ -76,6 +77,7 @@ export const previewer = {
 };
 
 export const compositions = {
+    tooltipPropId: 'Copy Property ID',
     name: 'Name',
     width: 'Width',
     height: 'Height',
@@ -115,6 +117,8 @@ export const compositions = {
 };
 
 export const publish = {
+    noVariablesError:
+        'No variables found on the project. Cannot proceed with publishing to Creative Manager until at least one variable is added to the project.',
     publishInProgress: 'Publish to Creative Manager in progress',
     btnRunTestBatch: 'Run Test Batch',
     btnCrM: 'Creative Manager',

package/src/index.ts

@@ -46,6 +46,7 @@ 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';
@@ -102,12 +103,7 @@ import {
     updateAssetStory
 } from './redux/actions/asset-list';
 import { getAssetTagList, addAssetTagToList } from './redux/actions/asset-tags';
-import {
-    cancelAssetUpload,
-    toggleTagFileName,
-    uploadAssets,
-    replaceAsset
-} from './redux/actions/asset-uploads';
+import { cancelAssetUpload, 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';
@@ -159,6 +155,7 @@ 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 {
@@ -215,6 +212,7 @@ export {
     AssetsTableSelectCell,
     AssetsTableTypeFilter,
     AssetsTableTypeCell,
+    AssetsTableGlobalCell,
     AssetsTableStatusCell,
     AssetsTableNameFilter,
     AssetsTableNameCell,
@@ -249,7 +247,6 @@ export {
     updateAssetName,
     updateAssetData,
     doAssetTableHydration,
-    toggleTagFileName,
     uploadAssets,
     replaceAsset,
     selectAsset,
@@ -311,5 +308,6 @@ export {
     ContextMenu,
     ContextMenuItem,
     ContextMenuTrigger,
-    Submenu
+    Submenu,
+    CopyPropIdButton
 };