@imposium-hub/components 2.2.44-5 → 2.2.44-7

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[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/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

@@ -77,6 +77,7 @@ export const previewer = {
 };
 
 export const compositions = {
+    tooltipPropId: 'Copy Property ID',
     name: 'Name',
     width: 'Width',
     height: 'Height',

package/src/index.ts

@@ -156,6 +156,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 {
@@ -309,5 +310,6 @@ export {
     ContextMenu,
     ContextMenuItem,
     ContextMenuTrigger,
-    Submenu
+    Submenu,
+    CopyPropIdButton
 };

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

@@ -175,7 +175,7 @@ const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
             const sId = assignToStory && storyId ? storyId : null;
             const processingTimeout: number = -1;
             const isUploading =
-                uploads.find((f) => f.filename === uploadBlobs[activeIndex].filename).percent > 0;
+                uploads.find((f) => f.filename === uploadBlobs[activeIndex].filename)?.percent > 0;
             if (!isUploading) {
                 api.uploadAsset(
                     sId,
@@ -188,6 +188,7 @@ const uploadAssetHandler = (api: IImposiumAPI, dispatch, getStore) => {
                         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,