diff --git a/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js b/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js index be7e7a1607..6e3533de04 100644 --- a/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js +++ b/frontend/src/metadata/components/popover/column-popover/dropdown-menu/index.js @@ -6,6 +6,7 @@ import Icon from '../../../../../components/icon'; import { gettext } from '../../../../../utils/constants'; import { CellType, COLUMNS_ICON_CONFIG, DEFAULT_DATE_FORMAT, DEFAULT_RATE_DATA, DEFAULT_SHOOTING_TIME_FORMAT, PRIVATE_COLUMN_KEY } from '../../../../constants'; import { getColumnDisplayName } from '../../../../utils/column'; +import { DEFAULT_FILE_STATUS_OPTIONS } from '../../../../constants/column/format'; import './index.css'; @@ -44,14 +45,6 @@ const COLUMNS = [ data: { format: DEFAULT_DATE_FORMAT }, groupby: 'predefined', canSetData: true, - }, { - icon: COLUMNS_ICON_CONFIG[CellType.LONG_TEXT], - type: CellType.LONG_TEXT, - name: getColumnDisplayName(PRIVATE_COLUMN_KEY.FILE_DESCRIPTION), - unique: true, - key: PRIVATE_COLUMN_KEY.FILE_DESCRIPTION, - canChangeName: false, - groupby: 'predefined' }, { icon: COLUMNS_ICON_CONFIG[CellType.SINGLE_SELECT], type: CellType.SINGLE_SELECT, @@ -59,6 +52,7 @@ const COLUMNS = [ unique: true, key: PRIVATE_COLUMN_KEY.FILE_STATUS, canChangeName: false, + data: { options: DEFAULT_FILE_STATUS_OPTIONS }, groupby: 'predefined' }, { icon: COLUMNS_ICON_CONFIG[CellType.DATE], diff --git a/frontend/src/metadata/constants/column/format.js b/frontend/src/metadata/constants/column/format.js index 19df723377..2f20f96eb6 100644 --- a/frontend/src/metadata/constants/column/format.js +++ b/frontend/src/metadata/constants/column/format.js @@ -1,3 +1,4 @@ +import { PREDEFINED_FILE_STATUS_OPTION_KEY } from './predefined'; import CellType from './type'; const DATE_COLUMN_OPTIONS = [ @@ -95,6 +96,25 @@ const DEFAULT_RATE_DATA = { type: 'rate' }; +const DEFAULT_FILE_STATUS_OPTIONS = [ + { + id: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_PROGRESS, + name: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_PROGRESS, + }, + { + id: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_REVIEW, + name: PREDEFINED_FILE_STATUS_OPTION_KEY.IN_REVIEW, + }, + { + id: PREDEFINED_FILE_STATUS_OPTION_KEY.DONE, + name: PREDEFINED_FILE_STATUS_OPTION_KEY.DONE, + }, + { + id: PREDEFINED_FILE_STATUS_OPTION_KEY.OUTDATED, + name: PREDEFINED_FILE_STATUS_OPTION_KEY.OUTDATED, + } +]; + export { COLLABORATOR_COLUMN_TYPES, DATE_COLUMN_OPTIONS, @@ -112,4 +132,5 @@ export { SINGLE_CELL_VALUE_COLUMN_TYPE_MAP, GEOLOCATION_FORMAT, DEFAULT_RATE_DATA, + DEFAULT_FILE_STATUS_OPTIONS, }; diff --git a/frontend/src/metadata/views/table/table-main/records-header/insert-column/index.js b/frontend/src/metadata/views/table/table-main/records-header/insert-column/index.js index 6f6dd77b34..fd7d0cacf1 100644 --- a/frontend/src/metadata/views/table/table-main/records-header/insert-column/index.js +++ b/frontend/src/metadata/views/table/table-main/records-header/insert-column/index.js @@ -45,7 +45,7 @@ const InsertColumn = ({ lastColumn, height, groupOffsetLeft, insertColumn: inser setColumnMenuOpen(false); setSelectedColumn(column); if (column.groupby === 'predefined' && !column.canSetData) { - handleSubmit(column.key, column.type, { key: column.key, data: {} }); + handleSubmit(column.key, column.type, { key: column.key, data: column.data || {} }); return; } setColumnPopoverShow(true);