{type === CellType.SINGLE_SELECT && (
<>
@@ -200,7 +196,7 @@ const HeaderDropdownMenu = ({ column, renameColumn, modifyColumnData, deleteColu
)}
{
if (isHideTriangle) return false;
- if (PRIVATE_COLUMN_KEYS.includes(column.key)) return false;
return window.sfMetadataContext.canModifyColumn(column);
}, [isHideTriangle, column]);
diff --git a/frontend/src/metadata/metadata-view/context.js b/frontend/src/metadata/metadata-view/context.js
index 14badafe18..eb81ccdbf1 100644
--- a/frontend/src/metadata/metadata-view/context.js
+++ b/frontend/src/metadata/metadata-view/context.js
@@ -1,5 +1,6 @@
import metadataAPI from '../api';
-import { UserService, LocalStorage } from './_basic';
+import { UserService, LocalStorage, PRIVATE_COLUMN_KEYS, EDITABLE_DATA_PRIVATE_COLUMN_KEYS,
+ EDITABLE_PRIVATE_COLUMN_KEYS, PREDEFINED_COLUMN_KEYS } from './_basic';
import EventBus from '../../components/common/event-bus';
import { username } from '../../utils/constants';
@@ -12,6 +13,7 @@ class Context {
this.userService = null;
this.eventBus = null;
this.hasInit = false;
+ this.permission = 'r';
}
async init({ otherSettings }) {
@@ -21,7 +23,7 @@ class Context {
this.settings = otherSettings || {};
// init metadataAPI
- const { mediaUrl } = this.settings;
+ const { mediaUrl, repoInfo } = this.settings;
this.metadataAPI = metadataAPI;
// init localStorage
@@ -34,6 +36,8 @@ class Context {
const eventBus = new EventBus();
this.eventBus = eventBus;
+ this.permission = repoInfo.permission !== 'admin' && repoInfo.permission !== 'rw' ? 'r' : 'rw';
+
this.hasInit = true;
}
@@ -44,6 +48,7 @@ class Context {
this.userService = null;
this.eventBus = null;
this.hasInit = false;
+ this.permission = 'r';
};
getSetting = (key) => {
@@ -81,22 +86,46 @@ class Context {
return this.metadataAPI.getView(repoID, viewId);
};
+ getPermission = () => {
+ return this.permission;
+ };
+
canModifyCell = (column) => {
+ if (this.permission === 'r') return false;
const { editable } = column;
if (!editable) return false;
return true;
};
canModifyRow = (row) => {
+ if (this.permission === 'r') return false;
return true;
};
canModifyColumn = (column) => {
+ if (this.permission === 'r') return false;
+ if (PRIVATE_COLUMN_KEYS.includes(column.key) && !EDITABLE_PRIVATE_COLUMN_KEYS.includes(column.key)) return false;
return true;
};
- getPermission = () => {
- return 'rw';
+ canRenameColumn = (column) => {
+ if (this.permission === 'r') return false;
+ if (PRIVATE_COLUMN_KEYS.includes(column.key)) return false;
+ return true;
+ };
+
+ canModifyColumnData = (column) => {
+ if (this.permission === 'r') return false;
+ const { key } = column;
+ if (PRIVATE_COLUMN_KEYS.includes(key)) return EDITABLE_DATA_PRIVATE_COLUMN_KEYS.includes(key);
+ return true;
+ };
+
+ canDeleteColumn = (column) => {
+ if (this.permission === 'r') return false;
+ const { key } = column;
+ if (PRIVATE_COLUMN_KEYS.includes(key)) return PREDEFINED_COLUMN_KEYS.includes(key);
+ return true;
};
getCollaboratorsFromCache = () => {
diff --git a/frontend/src/metadata/metadata-view/hooks/collaborators.js b/frontend/src/metadata/metadata-view/hooks/collaborators.js
index 9b6b935ba7..73df4a3e02 100644
--- a/frontend/src/metadata/metadata-view/hooks/collaborators.js
+++ b/frontend/src/metadata/metadata-view/hooks/collaborators.js
@@ -19,6 +19,12 @@ export const CollaboratorsProvider = ({
setCollaborators(store?.collaborators || []);
}, [store?.collaborators]);
+ useEffect(() => {
+ if (!window.sfMetadata) return;
+ window.sfMetadata.collaborators = collaborators;
+ window.sfMetadata.collaboratorsCache = collaboratorsCache;
+ }, [collaborators, collaboratorsCache]);
+
const updateCollaboratorsCache = useCallback((user) => {
const newCollaboratorsCache = { ...collaboratorsCacheRef.current, [user.email]: user };
collaboratorsCacheRef.current = newCollaboratorsCache;
diff --git a/frontend/src/metadata/metadata-view/hooks/metadata.js b/frontend/src/metadata/metadata-view/hooks/metadata.js
index aeb4a3d4cf..231d314c39 100644
--- a/frontend/src/metadata/metadata-view/hooks/metadata.js
+++ b/frontend/src/metadata/metadata-view/hooks/metadata.js
@@ -12,7 +12,6 @@ export const MetadataProvider = ({
children,
repoID,
viewID,
- currentRepoInfo,
...params
}) => {
const [isLoading, setLoading] = useState(true);
@@ -37,11 +36,11 @@ export const MetadataProvider = ({
setLoading(true);
// init context
const context = new Context();
+ window.sfMetadata = {};
window.sfMetadataContext = context;
window.sfMetadataContext.init({ otherSettings: params });
window.sfMetadataContext.setSetting('viewID', viewID);
window.sfMetadataContext.setSetting('repoID', repoID);
- window.sfMetadataContext.setSetting('currentRepoInfo', currentRepoInfo);
storeRef.current = new Store({ context: window.sfMetadataContext, repoId: repoID, viewId: viewID });
window.sfMetadataStore = storeRef.current;
storeRef.current.initStartIndex();
@@ -59,6 +58,7 @@ export const MetadataProvider = ({
const unsubscribeUpdateRows = window.sfMetadataContext.eventBus.subscribe(EVENT_BUS_TYPE.UPDATE_TABLE_ROWS, updateMetadata);
return () => {
+ window.sfMetadata = {};
window.sfMetadataContext.destroy();
window.sfMetadataStore.destroy();
unsubscribeServerTableChanged();
@@ -67,7 +67,7 @@ export const MetadataProvider = ({
unsubscribeUpdateRows();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [repoID, viewID, currentRepoInfo]);
+ }, [repoID, viewID]);
return (
diff --git a/frontend/src/metadata/metadata-view/model/metadata/column.js b/frontend/src/metadata/metadata-view/model/metadata/column.js
index 0f8b001114..7083338f12 100644
--- a/frontend/src/metadata/metadata-view/model/metadata/column.js
+++ b/frontend/src/metadata/metadata-view/model/metadata/column.js
@@ -1,5 +1,5 @@
import { normalizeColumnData } from '../../utils/column-utils';
-import { CellType } from '../../_basic';
+import { CellType, PRIVATE_COLUMN_KEYS, EDITABLE_PRIVATE_COLUMN_KEYS } from '../../_basic';
class Column {
constructor(object) {
@@ -8,10 +8,15 @@ class Column {
this.type = object.type || '';
this.data = object.data || null;
this.width = object.width || 200;
- this.editable = object.editable || !this.key.startsWith('_') && this.type !== CellType.LONG_TEXT || false;
+ this.editable = this.enable_edit(this.key, this.type);
this.data = normalizeColumnData(this);
}
+ enable_edit = (key, type) => {
+ if (PRIVATE_COLUMN_KEYS.includes(key)) return EDITABLE_PRIVATE_COLUMN_KEYS.includes(key);
+ return type !== CellType.LONG_TEXT;
+ };
+
}
export default Column;
diff --git a/frontend/src/metadata/metadata-view/utils/column-utils.js b/frontend/src/metadata/metadata-view/utils/column-utils.js
index 6a7a3a4887..2678af898a 100644
--- a/frontend/src/metadata/metadata-view/utils/column-utils.js
+++ b/frontend/src/metadata/metadata-view/utils/column-utils.js
@@ -255,26 +255,25 @@ const getFileTypeColumnData = (column) => {
'_audio': { name: gettext('Audio'), color: '#FBD44A', textColor: '#FFFFFF', borderColor: '#E5C142', id: '_audio' },
'_code': { name: gettext('Code'), color: '#4ad8fb', textColor: '#FFFFFF', borderColor: '#4283e5', id: '_code' },
};
-
let newData = { ...data };
- newData.options = Array.isArray(newData.options) ? newData.options.map(o => {
- return { ..._OPTIONS[o.name] };
- }) : Object.keys(_OPTIONS);
+ newData.options = Array.isArray(data.options) ? data.options.map(o => {
+ return _OPTIONS[o.name];
+ }) : Object.values(_OPTIONS);
return newData;
};
+export const getDefaultFileStatusOptions = () => {
+ return [
+ { name: gettext('Draft'), color: '#EED5FF', textColor: '#202428', id: '_draft' },
+ { name: gettext('In review'), color: '#FFFDCF', textColor: '#202428', id: '_in_review' },
+ { name: gettext('Done'), color: '#59CB74', textColor: '#FFFFFF', borderColor: '#844BD2', id: '_done' },
+ ];
+};
+
const getFileStatusColumnData = (column) => {
const { data } = column;
- const _OPTIONS = {
- '_draft': { name: gettext('Draft'), color: '#EED5FF', textColor: '#202428', id: '_draft' },
- '_in_review': { name: gettext('In review'), color: '#FFFDCF', textColor: '#202428', id: '_in_review' },
- '_done': { name: gettext('Done'), color: '#59CB74', textColor: '#FFFFFF', borderColor: '#844BD2', id: '_done' },
- };
-
let newData = { ...data };
- newData.options = Array.isArray(newData.options) ? newData.options.map(o => {
- return { ..._OPTIONS[o.name] };
- }) : Object.keys(_OPTIONS);
+ newData.options = Array.isArray(data?.options) ? data.options : getDefaultFileStatusOptions();
return newData;
};
@@ -305,7 +304,6 @@ export const normalizeColumns = (columns) => {
type: columnType,
name: getColumnName(key, name),
width: columnsWidth[key] || 200,
- editable: !key.startsWith('_') && columnType !== CellType.LONG_TEXT
};
}).filter(column => !NOT_DISPLAY_COLUMN_KEYS.includes(column.key));
let displayColumns = [];
@@ -332,7 +330,6 @@ export function canEdit(col, record, enableCellSelect) {
if (col.editable != null && typeof (col.editable) === 'function') {
return enableCellSelect === true && col.editable(record);
}
- console.log(col);
return enableCellSelect === true && !!col.editable;
}