@imposium-hub/components 2.5.10-10 → 2.5.10-11

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

@@ -12,7 +12,6 @@ interface ISMPTEFieldProps {
     width?: string | number;
     onChange?(e): void;
     onBlur?(e): void;
-    onError?(e): void;
     info?: string;
     labelPosition?: string;
     labelWidth?: string | number;
@@ -76,7 +75,7 @@ class SMPTEField extends React.PureComponent<ISMPTEFieldProps, ISMPTEFieldState>
 
     private onBlur(e?) {
         const val = e ? e.target.value : this.inputRef.current.value;
-        const isValid = this.SMTPEValidator(val);
+        const isValid = this.smptValidator(val);
 
         if (e && e.key === 'Enter') {
             this.setDuration(isValid, val);
@@ -89,12 +88,10 @@ class SMPTEField extends React.PureComponent<ISMPTEFieldProps, ISMPTEFieldState>
 
     private onChange() {
         const val = this.inputRef.current.value;
-        const isValid = this.SMTPEValidator(val);
+        const isValid = this.smptValidator(val);
 
         if (isValid) {
             this.props.onChange(val);
-        } else {
-            this.props.onError(isValid);
         }
     }
 
@@ -104,13 +101,11 @@ class SMPTEField extends React.PureComponent<ISMPTEFieldProps, ISMPTEFieldState>
             const smpte = getSMPTE(frameRate, val);
             if (smpte && this.props.onBlur) {
                 this.props.onBlur(smpte);
-            } else {
-                this.props.onError(isValid);
             }
         }
     }
 
-    private SMTPEValidator(val) {
+    private smptValidator(val) {
         const isValidSMPTETimeCode = new RegExp(this.regex);
         const isValid = isValidSMPTETimeCode.test(val);
         const errorMsg = isValid ? null : TIMECODE.ERROR;

package/src/constants/copy.ts

@@ -273,7 +273,7 @@ export const copying: any = {
 };
 
 export const confirm: any = {
-    yes: 'Save',
-    no: "Don't Save",
+    yes: 'Yes',
+    no: 'No',
     cancel: 'Cancel'
 };

package/src/index.ts

@@ -40,7 +40,6 @@ import AssetField from './components/assets/AssetField';
 import AssetsTableDropzone from './components/assets/AssetsTableDropzone';
 import AssetsTableNameCell from './components/assets/AssetsTableNameCell';
 import AssetsTableNameFilter from './components/assets/AssetsTableNameFilter';
-import AssetsTableAssetIdFilter from './components/assets/AssetsTableAssetIdFilter';
 import AssetsTableSelectCell from './components/assets/AssetsTableSelectCell';
 import AssetsTableSelectFilter from './components/assets/AssetsTableSelectFilter';
 import AssetsTableTagsCell from './components/assets/AssetsTableTagsCell';
@@ -160,7 +159,6 @@ import ContextMenuTrigger from './components/context-menu/ContextMenuTrigger';
 import CopyPropIdButton from './components/copy-prop-id-button/CopyPropIdButton';
 import Submenu from './components/context-menu/SubMenu';
 import { ConfirmModal } from './components/confirm-modal/ConfirmModal';
-import AssetsTableAssetIdCell from './components/assets/AssetsTableAssetIdCell';
 
 export {
     AppWrapper,
@@ -219,8 +217,6 @@ export {
     AssetsTableGlobalCell,
     AssetsTableStatusCell,
     AssetsTableNameFilter,
-    AssetsTableAssetIdFilter,
-    AssetsTableAssetIdCell,
     AssetsTableNameCell,
     AssetsTableDurationCell,
     AssetsTableRateCell,

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

@@ -78,19 +78,22 @@ export const getAssets = (api: IImposiumAPI, storyId: string): any => {
 
 export const deleteAssets = (api: IImposiumAPI, ids: string[], storyId: string): any => {
     return (dispatch) => {
-        return new Promise<boolean>((resolve, reject) => {
-            dispatch(toggleLoading(true));
-            api.deleteAssets(ids)
-                .then(() => {
-                    dispatch(getAssets(api, storyId));
-                    dispatch(toggleLoading(false));
-                    resolve(true);
-                })
-                .catch((errors: Error[]) => {
-                    dispatch(toggleLoading(false));
-                    reject(false);
-                });
-        });
+        if (window.confirm(`Are you sure you want to delete ${ids.length} assets?`)) {
+            return new Promise<boolean>((resolve, reject) => {
+                dispatch(toggleLoading(true));
+                api.deleteAssets(ids)
+                    .then(() => {
+                        dispatch(getAssets(api, storyId));
+                        resolve(true);
+                    })
+                    .catch((errors: Error[]) => {
+                        dispatch(toggleLoading(false));
+                        reject(false);
+                    });
+            });
+        } else {
+            return Promise.resolve(false);
+        }
     };
 };
 
@@ -191,18 +194,20 @@ export const deleteAssetTags = (api: IImposiumAPI, id: string): any => {
 
 export const deleteAssetsTags = (api: IImposiumAPI, ids: string[], storyId: string): any => {
     return (dispatch) => {
-        return new Promise<void>((resolve, reject) => {
-            dispatch(toggleLoading(true));
-            api.deleteAssetsTags(ids)
-                .then(() => {
-                    dispatch(getAssets(api, storyId));
-                    resolve();
-                })
-                .catch((errors: Error[]) => {
-                    dispatch(toggleLoading(false));
-                    reject();
-                });
-        });
+        if (window.confirm(`Are you sure you want to remove all tags from ${ids.length} assets?`)) {
+            return new Promise<void>((resolve, reject) => {
+                dispatch(toggleLoading(true));
+                api.deleteAssetsTags(ids)
+                    .then(() => {
+                        dispatch(getAssets(api, storyId));
+                        resolve();
+                    })
+                    .catch((errors: Error[]) => {
+                        dispatch(toggleLoading(false));
+                        reject();
+                    });
+            });
+        }
     };
 };
 
@@ -240,18 +245,20 @@ export const updateAssetStory = (api: IImposiumAPI, id: string, storyId: string)
 
 export const decoupleAssets = (api: IImposiumAPI, ids: string[], storyId: string): any => {
     return (dispatch) => {
-        return new Promise<void>((resolve, reject) => {
-            dispatch(toggleLoading(true));
-            api.decoupleAssets(ids)
-                .then(() => {
-                    dispatch(getAssets(api, storyId));
-                    resolve();
-                })
-                .catch((errors: Error[]) => {
-                    dispatch(toggleLoading(false));
-                    reject();
-                });
-        });
+        if (window.confirm(`Are you sure you want to decouple ${ids.length} assets?`)) {
+            return new Promise<void>((resolve, reject) => {
+                dispatch(toggleLoading(true));
+                api.decoupleAssets(ids)
+                    .then(() => {
+                        dispatch(getAssets(api, storyId));
+                        resolve();
+                    })
+                    .catch((errors: Error[]) => {
+                        dispatch(toggleLoading(false));
+                        reject();
+                    });
+            });
+        }
     };
 };
 

package/src/components/assets/AssetsTableAssetIdCell.tsx

@@ -1,65 +0,0 @@
-import * as React from 'react';
-import { copying } from '../../constants/copy';
-import { updateFilters } from '../../redux/actions/asset-filters';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-interface IAssetsTableAssetIdCellProps {
-    cell: any;
-    onNotification?: (e) => void;
-    onError?: (e) => void;
-}
-
-const AssetsTableAssetIdCell: React.FC<IAssetsTableAssetIdCellProps> = (
-    props: IAssetsTableAssetIdCellProps
-) => {
-    const {
-        onNotification,
-        onError,
-        cell: {
-            row: {
-                original: { id }
-            }
-        }
-    } = props;
-    console.log('AssetsTableAssetIdCell');
-    console.log(id);
-
-    const copyToClipboard = (e) => {
-        navigator.clipboard.writeText(e.target.textContent).then(
-            () => {
-                if (onNotification) {
-                    onNotification(`${copying.copied}`);
-                }
-            },
-            () => {
-                if (onError) {
-                    onError(`${copying.error}`);
-                }
-            }
-        );
-    };
-
-    return (
-        <div
-            key={id}
-            className='imposium-asset-id'
-            onClick={(e) => copyToClipboard(e)}>
-            {id}
-        </div>
-    );
-};
-
-const mapDispatchToProps = (dispatch): any => {
-    return bindActionCreators({ updateFilters }, dispatch);
-};
-
-const mapStateToProps = (state): any => {
-    return { assetFilters: state.assetFilters };
-};
-
-const AssetsTableAssetIdCellMemoized = connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(React.memo(AssetsTableAssetIdCell));
-export default AssetsTableAssetIdCellMemoized;

package/src/components/assets/AssetsTableAssetIdFilter.tsx

@@ -1,40 +0,0 @@
-import * as React from 'react';
-import TextField from '../text-field/TextField';
-import { updateFilters } from '../../redux/actions/asset-filters';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-interface IAssetsTableAssetIdFilterProps {
-    assetFilters: any;
-    updateFilters: (filters: any) => any;
-}
-
-class AssetsTableAssetIdFilter extends React.PureComponent<IAssetsTableAssetIdFilterProps> {
-    public render = (): JSX.Element => {
-        const { assetFilters } = this.props;
-
-        return (
-            <TextField
-                className='asset-id'
-                submittable
-                submittableType='search'
-                value={assetFilters.id}
-                doSubmit={(n) => this.props.updateFilters({ id: n })}
-            />
-        );
-    };
-}
-
-const mapDispatchToProps = (dispatch): any => {
-    return bindActionCreators({ updateFilters }, dispatch);
-};
-
-const mapStateToProps = (state): any => {
-    return { assetFilters: state.assetFilters };
-};
-
-const AssetsTableAssetIdFilterMemoized = connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(React.memo(AssetsTableAssetIdFilter));
-export default AssetsTableAssetIdFilterMemoized;