Merge pull request #6575 from haiwen/feat-metadata-multiple-select

feat: metadata multiple select
haiwen · Aug 16, 2024 · db4fce1 · db4fce1
2 parents 0142fe4 + 285c47a
commit db4fce1
Show file tree

Hide file tree

Showing 49 changed files with 927 additions and 81 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -14,7 +14,7 @@
     "@seafile/sdoc-editor": "1.0.50",
     "@seafile/seafile-calendar": "0.0.12",
     "@seafile/seafile-editor": "1.0.109",
-    "@seafile/sf-metadata-ui-component": "0.0.21",
+    "@seafile/sf-metadata-ui-component": "0.0.22",
     "@uiw/codemirror-extensions-langs": "^4.19.4",
     "@uiw/react-codemirror": "^4.19.4",
     "axios": "^1.7.3",

diff --git a/frontend/src/assets/icons/multiple-select.svg b/frontend/src/assets/icons/multiple-select.svg
diff --git a/frontend/src/components/dir-view-mode/dir-views.js b/frontend/src/components/dir-view-mode/dir-views.js
@@ -17,7 +17,7 @@ const DirViews = ({ userPerm, repoID, currentPath, currentRepoInfo }) => {
     return [
       { key: 'extended-properties', value: gettext('Extended properties') }
     ];
-  }, [enableMetadataManagement, userPerm]);
+  }, [enableMetadataManagement, currentRepoInfo]);
 
   const moreOperationClick = useCallback((operationKey) => {
     if (operationKey === 'extended-properties') {

diff --git a/frontend/src/components/dirent-detail/dirent-details/file-details.js b/frontend/src/components/dirent-detail/dirent-details/file-details.js
@@ -62,7 +62,7 @@ const FileDetails = React.memo(({ repoID, repoInfo, dirent, path, direntDetail,
           </div>
         </DetailItem>
       )}
-      {window.app.pageOptions.enableMetadataManagement && (
+      {window.app.pageOptions.enableMetadataManagement && enableMetadata && (
         <MetadataDetails repoID={repoID} filePath={direntPath} repoInfo={repoInfo} direntType="file" />
       )}
       {isEditFileTagShow &&

diff --git a/frontend/src/metadata/metadata-details/index.js b/frontend/src/metadata/metadata-details/index.js
@@ -9,11 +9,11 @@ import toaster from '../../components/toast';
 import { gettext } from '../../utils/constants';
 import { DetailEditor, CellFormatter } from '../metadata-view';
 import { getColumnOriginName } from '../metadata-view/utils/column-utils';
-import { CellType, getColumnOptions, getOptionName, PREDEFINED_COLUMN_KEYS } from '../metadata-view/_basic';
+import { CellType, getColumnOptions, getOptionName, PREDEFINED_COLUMN_KEYS, getColumnOptionNamesByIds } from '../metadata-view/_basic';
 
 import './index.css';
 
-const MetadataDetails = ({ repoID, filePath, repoInfo, direntType, emptyTip }) => {
+const MetadataDetails = ({ repoID, filePath, repoInfo, direntType }) => {
   const [isLoading, setLoading] = useState(true);
   const [metadata, setMetadata] = useState({ record: {}, fields: [] });
   const permission = useMemo(() => repoInfo.permission !== 'admin' && repoInfo.permission !== 'rw' ? 'r' : 'rw', [repoInfo]);
@@ -47,6 +47,8 @@ const MetadataDetails = ({ repoID, filePath, repoInfo, direntType, emptyTip }) =
     if (!PREDEFINED_COLUMN_KEYS.includes(field.key) && field.type === CellType.SINGLE_SELECT) {
       const options = getColumnOptions(field);
       update = { [fileName]: getOptionName(options, newValue) };
+    } else if (field.type === CellType.MULTIPLE_SELECT) {
+      update = { [fileName]: newValue ? getColumnOptionNamesByIds(field, newValue) : [] };
     }
     metadataAPI.modifyRecord(repoID, record._id, update, record._obj_id).then(res => {
       const newMetadata = { ...metadata, record: { ...record, ...update } };
@@ -73,6 +75,9 @@ const MetadataDetails = ({ repoID, filePath, repoInfo, direntType, emptyTip }) =
       update = { [fileName]: newOption.id };
       if (!PREDEFINED_COLUMN_KEYS.includes(fieldKey) && newField.type === CellType.SINGLE_SELECT) {
         update = { [fileName]: getOptionName(options, newOption.id) };
+      } else if (newField.type === CellType.MULTIPLE_SELECT) {
+        const oldValue = getCellValueByColumn(record, newField) || [];
+        update = { [fileName]: [...oldValue, newOption.name] };
       }
       return metadataAPI.modifyRecord(repoID, record._id, update, record._obj_id);
     }).then(res => {

diff --git a/frontend/src/metadata/metadata-view/_basic/constants/column/format.js b/frontend/src/metadata/metadata-view/_basic/constants/column/format.js
@@ -53,6 +53,7 @@ const NOT_SUPPORT_EDIT_COLUMN_TYPE_MAP = {
 
 const MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP = {
   [CellType.COLLABORATOR]: true,
+  [CellType.MULTIPLE_SELECT]: true,
 };
 const SINGLE_CELL_VALUE_COLUMN_TYPE_MAP = {
   [CellType.TEXT]: true,

diff --git a/frontend/src/metadata/metadata-view/_basic/constants/column/icon.js b/frontend/src/metadata/metadata-view/_basic/constants/column/icon.js
@@ -13,6 +13,7 @@ const COLUMNS_ICON_CONFIG = {
   [CellType.DATE]: 'date',
   [CellType.LONG_TEXT]: 'long-text',
   [CellType.SINGLE_SELECT]: 'single-select',
+  [CellType.MULTIPLE_SELECT]: 'multiple-select',
   [CellType.NUMBER]: 'number',
   [CellType.GEOLOCATION]: 'location',
 };
@@ -30,6 +31,7 @@ const COLUMNS_ICON_NAME = {
   [CellType.DATE]: 'Date',
   [CellType.LONG_TEXT]: 'Long text',
   [CellType.SINGLE_SELECT]: 'Single select',
+  [CellType.MULTIPLE_SELECT]: 'Multiple select',
   [CellType.NUMBER]: 'Number',
   [CellType.GEOLOCATION]: 'Geolocation',
 };

diff --git a/frontend/src/metadata/metadata-view/_basic/constants/column/type.js b/frontend/src/metadata/metadata-view/_basic/constants/column/type.js
@@ -11,6 +11,7 @@ const CellType = {
   DATE: 'date',
   LONG_TEXT: 'long-text',
   SINGLE_SELECT: 'single-select',
+  MULTIPLE_SELECT: 'multiple-select',
   NUMBER: 'number',
   GEOLOCATION: 'geolocation',
 };

diff --git a/frontend/src/metadata/metadata-view/_basic/constants/filter/filter-column-options.js b/frontend/src/metadata/metadata-view/_basic/constants/filter/filter-column-options.js
@@ -72,6 +72,16 @@ const FILTER_COLUMN_OPTIONS = {
       FILTER_PREDICATE_TYPE.NOT_EMPTY,
     ],
   },
+  [CellType.MULTIPLE_SELECT]: {
+    filterPredicateList: [
+      FILTER_PREDICATE_TYPE.HAS_ANY_OF,
+      FILTER_PREDICATE_TYPE.HAS_ALL_OF,
+      FILTER_PREDICATE_TYPE.HAS_NONE_OF,
+      FILTER_PREDICATE_TYPE.IS_EXACTLY,
+      FILTER_PREDICATE_TYPE.EMPTY,
+      FILTER_PREDICATE_TYPE.NOT_EMPTY,
+    ],
+  },
   [CellType.CTIME]: {
     filterPredicateList: datePredicates,
     filterTermModifierList: dateTermModifiers,

diff --git a/frontend/src/metadata/metadata-view/_basic/constants/sort.js b/frontend/src/metadata/metadata-view/_basic/constants/sort.js
@@ -12,6 +12,7 @@ const SORT_COLUMN_OPTIONS = [
   CellType.TEXT,
   CellType.DATE,
   CellType.SINGLE_SELECT,
+  CellType.MULTIPLE_SELECT,
   CellType.COLLABORATOR,
   CellType.CHECKBOX,
   CellType.NUMBER,

diff --git a/frontend/src/metadata/metadata-view/_basic/index.js b/frontend/src/metadata/metadata-view/_basic/index.js
@@ -154,4 +154,6 @@ export {
   isNumber,
   getCellValueDisplayString,
   getCellValueStringResult,
+  getColumnOptionNamesByIds,
+  getColumnOptionIdsByNames,
 } from './utils';
diff --git a/frontend/src/metadata/metadata-view/_basic/utils/cell/column/index.js b/frontend/src/metadata/metadata-view/_basic/utils/cell/column/index.js
@@ -11,6 +11,8 @@ export {
 export {
   getOption,
   getColumnOptionNameById,
+  getColumnOptionNamesByIds,
+  getColumnOptionIdsByNames,
   getOptionName,
   getMultipleOptionName,
 } from './option';

diff --git a/frontend/src/metadata/metadata-view/_basic/utils/cell/column/option.js b/frontend/src/metadata/metadata-view/_basic/utils/cell/column/option.js
@@ -36,13 +36,46 @@ const getColumnOptionNameById = (column, optionId) => {
   return getOptionName(options, optionId);
 };
 
+/**
+ * Get column option name by id
+ * @param {object} column e.g. { data: { options, ... }, ... }
+ * @param {array} optionIds
+ * @returns options name, array
+ */
+const getColumnOptionNamesByIds = (column, optionIds) => {
+  if (PRIVATE_COLUMN_KEYS.includes(column.key)) return optionIds;
+  if (!Array.isArray(optionIds) || optionIds.length === 0) return [];
+  const options = getColumnOptions(column);
+  if (!Array.isArray(options) || options.length === 0) return [];
+  return optionIds.map(optionId => getOptionName(options, optionId)).filter(name => name);
+};
+
+/**
+ * Get column option name by id
+ * @param {object} column e.g. { data: { options, ... }, ... }
+ * @param {array} option names
+ * @returns options id, array
+ */
+const getColumnOptionIdsByNames = (column, names) => {
+  if (PRIVATE_COLUMN_KEYS.includes(column.key)) return names;
+  if (!Array.isArray(names) || names.length === 0) return [];
+  const options = getColumnOptions(column);
+  if (!Array.isArray(options) || options.length === 0) return [];
+  return names.map(name => {
+    const option = getOption(options, name);
+    if (option) return option.id;
+    return null;
+  }).filter(name => name);
+};
+
 /**
  * Get concatenated options names of given ids.
  * @param {array} options e.g. [ { id, color, name, ... }, ... ]
  * @param {array} targetOptionsIds e.g. [ option.id, ... ]
  * @returns concatenated options names, string. e.g. 'name1, name2'
  */
-const getMultipleOptionName = (options, targetOptionsIds) => {
+const getMultipleOptionName = (column, targetOptionsIds) => {
+  const options = getColumnOptions(column);
   if (!Array.isArray(targetOptionsIds) || !Array.isArray(options)) return '';
   const selectedOptions = options.filter((option) => targetOptionsIds.includes(option.id));
   if (selectedOptions.length === 0) return '';
@@ -53,5 +86,7 @@ export {
   getOption,
   getOptionName,
   getColumnOptionNameById,
+  getColumnOptionNamesByIds,
+  getColumnOptionIdsByNames,
   getMultipleOptionName,
 };
diff --git a/frontend/src/metadata/metadata-view/_basic/utils/cell/index.js b/frontend/src/metadata/metadata-view/_basic/utils/cell/index.js
@@ -28,4 +28,6 @@ export {
   getGeolocationByGranularity,
   getFloatNumber,
   isNumber,
+  getColumnOptionNamesByIds,
+  getColumnOptionIdsByNames,
 } from './column';
diff --git a/frontend/src/metadata/metadata-view/_basic/utils/filter/filter-column/index.js b/frontend/src/metadata/metadata-view/_basic/utils/filter/filter-column/index.js
@@ -5,3 +5,4 @@ export { checkboxFilter } from './checkbox';
 export { singleSelectFilter } from './single-select';
 export { collaboratorFilter } from './collaborator';
 export { numberFilter } from './number';
+export { multipleSelectFilter } from './multiple-select';
diff --git a/frontend/src/metadata/metadata-view/_basic/utils/filter/filter-column/multiple-select.js b/frontend/src/metadata/metadata-view/_basic/utils/filter/filter-column/multiple-select.js
@@ -0,0 +1,54 @@
+import { FILTER_PREDICATE_TYPE } from '../../../constants/filter/filter-predicate';
+
+/**
+ * Filter multiple-select
+ * @param {array} optionIds e.g. [ option.id, ... ]
+ * @param {string} filter_predicate
+ * @param {array} filter_term option ids
+ * @returns bool
+ */
+const multipleSelectFilter = (optionIds, { filter_predicate, filter_term }) => {
+  switch (filter_predicate) {
+    case FILTER_PREDICATE_TYPE.HAS_ANY_OF: {
+      return (
+        filter_term.length === 0
+        || (Array.isArray(optionIds) && optionIds.some((optionId) => filter_term.includes(optionId)))
+      );
+    }
+    case FILTER_PREDICATE_TYPE.HAS_ALL_OF: {
+      return (
+        filter_term.length === 0
+        || (Array.isArray(optionIds) && filter_term.every((optionId) => optionIds.includes(optionId)))
+      );
+    }
+    case FILTER_PREDICATE_TYPE.HAS_NONE_OF: {
+      if (filter_term.length === 0 || !Array.isArray(optionIds) || optionIds.length === 0) {
+        return true;
+      }
+      return filter_term.every((optionId) => optionIds.indexOf(optionId) < 0);
+    }
+    case FILTER_PREDICATE_TYPE.IS_EXACTLY: {
+      if (filter_term.length === 0) {
+        return true;
+      }
+      if (!Array.isArray(optionIds)) {
+        return false;
+      }
+      const uniqueArr = (arr) => [...new Set(arr)].sort();
+      return uniqueArr(optionIds).toString() === uniqueArr(filter_term).toString();
+    }
+    case FILTER_PREDICATE_TYPE.EMPTY: {
+      return !Array.isArray(optionIds) || optionIds.length === 0;
+    }
+    case FILTER_PREDICATE_TYPE.NOT_EMPTY: {
+      return Array.isArray(optionIds) && optionIds.length > 0;
+    }
+    default: {
+      return false;
+    }
+  }
+};
+
+export {
+  multipleSelectFilter,
+};
diff --git a/frontend/src/metadata/metadata-view/_basic/utils/filter/filter-row.js b/frontend/src/metadata/metadata-view/_basic/utils/filter/filter-row.js
@@ -10,6 +10,7 @@ import {
   singleSelectFilter,
   collaboratorFilter,
   numberFilter,
+  multipleSelectFilter,
 } from './filter-column';
 import {
   FILTER_CONJUNCTION_TYPE,
@@ -42,6 +43,9 @@ const getFilterResult = (row, filter, { username, userId }) => {
     case CellType.SINGLE_SELECT: {
       return singleSelectFilter(cellValue, filter);
     }
+    case CellType.MULTIPLE_SELECT: {
+      return multipleSelectFilter(cellValue, filter);
+    }
     case CellType.NUMBER: {
       return numberFilter(cellValue, filter);
     }

diff --git a/frontend/src/metadata/metadata-view/_basic/utils/group/group-row.js b/frontend/src/metadata/metadata-view/_basic/utils/group/group-row.js
@@ -5,6 +5,8 @@ import {
   sortNumber,
   sortCheckbox,
   sortCollaborator,
+  sortSingleSelect,
+  sortMultipleSelect,
 } from '../sort/sort-column';
 import { MAX_GROUP_LEVEL } from '../../constants/group';
 import {
@@ -45,6 +47,9 @@ const _getFormattedCellValue = (cellValue, groupby) => {
     case CellType.SINGLE_SELECT: {
       return cellValue || null;
     }
+    case CellType.MULTIPLE_SELECT: {
+      return Array.isArray(cellValue) ? cellValue : [];
+    }
     case CellType.COLLABORATOR: {
       return Array.isArray(cellValue) ? cellValue : [];
     }
@@ -98,8 +103,18 @@ const _findGroupIndex = (sCellValue, cellValue2GroupIndexMap, groupsLength) => {
 const getSortedGroups = (groups, groupbys, level, collaborators = []) => {
   const sortFlag = 0;
   const { column, sort_type } = groupbys[level];
-  const { type: columnType } = column;
+  const { type: columnType, data: columnData } = column;
   const normalizedSortType = sort_type || SORT_TYPE.UP;
+  let option_id_index_map = {};
+  if (columnType === CellType.SINGLE_SELECT || columnType === CellType.MULTIPLE_SELECT) {
+    const { options } = columnData || {};
+    if (Array.isArray(options)) {
+      options.forEach((option, index) => {
+        option_id_index_map[option.id] = index;
+      });
+    }
+  }
+
   groups.sort((currGroupRow, nextGroupRow) => {
     let { cell_value: currCellVal } = currGroupRow;
     let { cell_value: nextCellVal } = nextGroupRow;
@@ -121,6 +136,10 @@ const getSortedGroups = (groups, groupbys, level, collaborators = []) => {
           nextCollaborators = getCollaboratorsNames(nextCollaborators, collaborators);
         }
         sortResult = sortCollaborator(currCollaborators, nextCollaborators, normalizedSortType);
+      } else if (columnType === CellType.SINGLE_SELECT) {
+        sortResult = sortSingleSelect(currCellVal, nextCellVal, { sort_type: normalizedSortType, option_id_index_map });
+      } else if (columnType === CellType.MULTIPLE_SELECT) {
+        sortResult = sortMultipleSelect(currCellVal, nextCellVal, { sort_type: normalizedSortType, option_id_index_map });
       }
       return sortFlag || sortResult;
     }

diff --git a/frontend/src/metadata/metadata-view/_basic/utils/index.js b/frontend/src/metadata/metadata-view/_basic/utils/index.js
@@ -25,6 +25,8 @@ export {
   isNumber,
   getCellValueDisplayString,
   getCellValueStringResult,
+  getColumnOptionNamesByIds,
+  getColumnOptionIdsByNames,
 } from './cell';
 export {
   getColumnType,

diff --git a/frontend/src/metadata/metadata-view/_basic/utils/sort/core.js b/frontend/src/metadata/metadata-view/_basic/utils/sort/core.js
@@ -61,7 +61,8 @@ const deleteInvalidSort = (sorts, columns) => {
     let newSort = { ...sort, column: sortColumn };
     const { type: columnType } = sortColumn;
     switch (columnType) {
-      case CellType.SINGLE_SELECT: {
+      case CellType.SINGLE_SELECT:
+      case CellType.MULTIPLE_SELECT: {
         const options = getColumnOptions(sortColumn);
         let option_id_index_map = {};
         options.forEach((option, index) => {

diff --git a/frontend/src/metadata/metadata-view/_basic/utils/sort/index.js b/frontend/src/metadata/metadata-view/_basic/utils/sort/index.js
@@ -13,6 +13,7 @@ export {
   sortCollaborator,
   sortNumber,
   sortSingleSelect,
+  sortMultipleSelect,
 } from './sort-column';
 
 export {

diff --git a/frontend/src/metadata/metadata-view/_basic/utils/sort/sort-column/index.js b/frontend/src/metadata/metadata-view/_basic/utils/sort/sort-column/index.js
@@ -8,3 +8,4 @@ export { sortCheckbox } from './checkbox';
 export { sortCollaborator } from './collaborator';
 export { sortNumber } from './number';
 export { sortSingleSelect } from './single-select';
+export { sortMultipleSelect } from './multiple-select';