@imposium-hub/components 1.60.8 → 1.60.10

package/src/components/assets/AssetsTableTagsPivot.tsx

@@ -35,17 +35,17 @@ class AssetsTableTagsPivot extends React.PureComponent<IAssetsTableTagsPivotProp
             row: { original },
             project: { storyId }
         } = this.props;
-
-        let newTags = tags.split(',');
-        const arr = [...original.tags, ...newTags];
+        const newTags = tags.trim();
+        let newTagsArray = newTags.split(',');
+        const arr = [...original.tags, ...newTagsArray];
         const dupedTags = arr.filter((item, index) => arr.indexOf(item) !== index);
 
-        newTags = newTags.filter((el) => {
+        newTagsArray = newTagsArray.filter((el) => {
             return dupedTags.indexOf(el) < 0;
         });
 
-        if (newTags) {
-            this.props.addAssetTag(this.props.api, assetId, newTags.join());
+        if (newTagsArray) {
+            this.props.addAssetTag(this.props.api, assetId, newTagsArray.join());
             this.props.getAssetTagList(this.props.api, storyId);
         }
     };

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

@@ -135,7 +135,7 @@ const DataTable: React.FC<IDataTableProps> = (props: IDataTableProps) => {
         sortBy: manualSortBy ? props.sortBy : [],
         pageIndex: manualPagination ? props.currentPage - 1 : undefined,
         pageSize: props.itemsPerPage,
-        autoResetExpanded: false
+        autoResetExpanded: true
     };
 
     const {
@@ -167,7 +167,7 @@ const DataTable: React.FC<IDataTableProps> = (props: IDataTableProps) => {
             initialState: initialTableState,
             manualFilters: true, // always true
             disableMultiSorting: true, // always true
-            autoResetExpanded: false,
+            autoResetExpanded: true,
             disableSortRemove: manualSortBy,
             pageCount: props.totalPages,
             pageSize: props.itemsPerPage
@@ -373,14 +373,15 @@ const DataTable: React.FC<IDataTableProps> = (props: IDataTableProps) => {
                                 {cell.render('Cell')}
                             </td>
                         ));
+                        const rowKey = row?.original?.id || i;
 
                         return (
-                            <React.Fragment key={`row-${i}`}>
+                            <React.Fragment key={`row-${rowKey}`}>
                                 {props.dnd && (
                                     <DataTableDnDWrapper
                                         rowProps={rowProps}
                                         rowRef={activeRef}
-                                        key={`row-${i}`}
+                                        key={`row-${rowKey}`}
                                         row={row}
                                         dndType={props.dndType}
                                         dndName={props.dndName}>
@@ -390,7 +391,7 @@ const DataTable: React.FC<IDataTableProps> = (props: IDataTableProps) => {
 
                                 {!props.dnd && (
                                     <tr
-                                        key={`row-${i}`}
+                                        key={`row-${rowKey}`}
                                         ref={activeRef}
                                         {...rowProps}>
                                         {rowContent}
@@ -399,6 +400,7 @@ const DataTable: React.FC<IDataTableProps> = (props: IDataTableProps) => {
 
                                 {row.isExpanded && (
                                     <tr
+                                        key={`row-${rowKey}`}
                                         {...row.getRowProps({ key: 'pivot-row' })}
                                         className='ip-pivot-row'>
                                         <td

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

@@ -54,6 +54,7 @@ interface IStoryPreviewerState {
     timeElapsed: number;
     isTimeOut: boolean;
     error: boolean;
+    jobLogLoading: boolean;
 }
 
 class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPreviewerState> {
@@ -80,7 +81,8 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
             rendering: false,
             isTimeOut: false,
             compositionOverride: null,
-            error: false
+            error: false,
+            jobLogLoading: false
         };
 
         this.timer = new Timer({
@@ -760,12 +762,16 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
 
     private downloadExpLog = (expId) => {
         const { api } = this.props;
-        api.getExperienceLog(expId).then((res: Blob) => {
-            saveAs(res, `${expId}.txt`);
-        });
+        this.setState({ jobLogLoading: true }, () =>
+            api.getExperienceLog(expId).then((res: Blob) => {
+                this.setState({ jobLogLoading: false });
+                saveAs(res, `${expId}.txt`);
+            })
+        );
     };
 
     private expIdField(expId) {
+        const { jobLogLoading } = this.state;
         return (
             <>
                 <TextField
@@ -782,6 +788,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                         position: 'relative',
                         bottom: '2px'
                     }}
+                    loading={jobLogLoading}
                     onClick={() => this.downloadExpLog(expId)}>
                     {copy.expJobLog} {ICON_DOWNLOAD}
                 </Button>

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

@@ -113,7 +113,7 @@ class TextField extends React.PureComponent<ITextFieldProps, ITextFieldState> {
             this.textAreaRef.onkeydown = (e) => {
                 if (e.key === 'Enter' && internalValue !== '') {
                     hotkeys.unbind('enter', this.evtHandlers.submittable);
-                    this.props.doSubmit(internalValue);
+                    this.setState({ internalValue: '' }, () => this.props.doSubmit(internalValue));
                 }
             };
         }
@@ -241,7 +241,6 @@ class TextField extends React.PureComponent<ITextFieldProps, ITextFieldState> {
         const { internalValue } = this.state;
 
         if (!clear && internalValue !== '') {
-            console.log('forceSubmit', internalValue);
             this.props.doSubmit(internalValue);
 
             if (this.props.submittableType === 'add') {