diff --git a/frontend/src/metadata/metadata-tree-view/index.js b/frontend/src/metadata/metadata-tree-view/index.js index 66d7833b42..45da6133a9 100644 --- a/frontend/src/metadata/metadata-tree-view/index.js +++ b/frontend/src/metadata/metadata-tree-view/index.js @@ -8,6 +8,7 @@ import { PRIVATE_FILE_TYPE } from '../../constants'; import ViewItem from './view-item'; import { useMetadata } from '../hooks'; import { AddView } from '../metadata-view/components/popover/view-popover'; +import { VIEW_TYPE_ICON } from '../metadata-view/_basic'; import './index.css'; @@ -132,7 +133,7 @@ const MetadataTreeView = ({ userPerm, currentPath }) => { {showInput && (
- +
{ if (!fileType || fileType === 'sdoc') { window.open(url); } else { - window.open(window.location.origin + window.location.pathname + Utils.encodePath(Utils.joinPath(parentDir, fileName))); + let pathname = window.location.pathname; + if (pathname.endsWith('/')) { + pathname = pathname.slice(0, -1); + } + window.open(window.location.origin + pathname + Utils.encodePath(Utils.joinPath(parentDir, fileName))); } return null; }; diff --git a/frontend/src/metadata/metadata-view/components/popover/sort-popover/index.js b/frontend/src/metadata/metadata-view/components/popover/sort-popover/index.js index 17680052b9..52c4f55a5e 100644 --- a/frontend/src/metadata/metadata-view/components/popover/sort-popover/index.js +++ b/frontend/src/metadata/metadata-view/components/popover/sort-popover/index.js @@ -49,6 +49,7 @@ class SortPopover extends Component { this.columnsOptions = this.createColumnsOptions(columns); this.state = { sorts: getDisplaySorts(sorts, columns), + isSubmitDisabled: true, }; this.isSelectOpen = false; } @@ -187,9 +188,9 @@ class SortPopover extends Component { }; renderSortItem = (column, sort, index) => { - let { name, type } = column; + const { name, type } = column; const { readOnly } = this.props; - let selectedColumn = { + const selectedColumn = { label: ( @@ -198,9 +199,10 @@ class SortPopover extends Component { ) }; - let selectedTypeShow = sort.sort_type; - let selectedSortType = selectedTypeShow && { - label: {gettext(selectedTypeShow)} + const selectedType = sort.sort_type; + const selectedTypeOption = SORT_TYPES.find(sortType => sortType.value === selectedType); + const selectedSortType = selectedType && { + label: {selectedTypeOption?.name || gettext('Up')} }; return ( diff --git a/frontend/src/metadata/metadata-view/components/view/table/table-main/records/group-body/index.js b/frontend/src/metadata/metadata-view/components/view/table/table-main/records/group-body/index.js index 66e60f6384..444e9f51c4 100644 --- a/frontend/src/metadata/metadata-view/components/view/table/table-main/records/group-body/index.js +++ b/frontend/src/metadata/metadata-view/components/view/table/table-main/records/group-body/index.js @@ -870,6 +870,7 @@ class GroupBody extends Component { width - defaultColumnWidth) { + if (width <= 800) { + defaultColumnWidth = 20; + } + if (offsetX > window.innerWidth - defaultColumnWidth) { window.sfMetadataBody.scrollToRight(); } else if (offsetX < props.frozenColumnsWidth + defaultColumnWidth + left) { window.sfMetadataBody.scrollToLeft(); @@ -175,7 +178,7 @@ const Cell = ({ ); - if (!canModifyColumnOrder || column.key === PRIVATE_COLUMN_KEY.FILE_NAME) { + if (!canModifyColumnOrder) { return (
{cell} diff --git a/frontend/src/metadata/metadata-view/components/view/table/table-main/records/records-header/index.js b/frontend/src/metadata/metadata-view/components/view/table/table-main/records/records-header/index.js index 3148aa5374..4a74b3a569 100644 --- a/frontend/src/metadata/metadata-view/components/view/table/table-main/records/records-header/index.js +++ b/frontend/src/metadata/metadata-view/components/view/table/table-main/records/records-header/index.js @@ -11,7 +11,7 @@ import ActionsCell from './actions-cell'; import { isMobile } from '../../../../../../utils'; import { getFrozenColumns } from '../../../../../../utils/table-utils'; import { isFrozen, recalculateColumnMetricsByResizeColumn } from '../../../../../../utils/column-utils'; -import { GRID_HEADER_DEFAULT_HEIGHT, GRID_HEADER_DOUBLE_HEIGHT } from '../../../../../../constants'; +import { GRID_HEADER_DEFAULT_HEIGHT, GRID_HEADER_DOUBLE_HEIGHT, SEQUENCE_COLUMN_WIDTH } from '../../../../../../constants'; import InsertColumn from './insert-column'; import html5DragDropContext from '../../../../../../../../pages/wiki2/wiki-nav/html5DragDropContext'; @@ -83,7 +83,7 @@ const RecordsHeader = ({ const frozenColumns = getFrozenColumns(columnMetrics.columns); const displayColumns = columnMetrics.columns.slice(colOverScanStartIdx, colOverScanEndIdx); - const frozenColumnsWidth = frozenColumns.reduce((total, c) => total + c.width, 0); + const frozenColumnsWidth = frozenColumns.reduce((total, c) => total + c.width, groupOffsetLeft + SEQUENCE_COLUMN_WIDTH); return (