Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

fix: DEV-3315: Custom column order needs to be different for different tabs #102

Open
yyassi-heartex wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: DEV-3315: Custom column order needs to be different for different tabs #102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3835d10
fix: DEV-3315: Custom column order needs to be different for differen…
yyassi-heartex Sep 2, 2022
db72de8
Merge branch 'master' into fb-dev-3315
yyassi-heartex Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/components/Common/Table/Table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,19 @@ export const Table = observer(
...props
}) => {
const colOrderKey = 'dm:columnorder';
const tabColOrderKey = `dm:${window.DM.viewsStore.selected.id}:columnorder`;
const defaultOrder = localStorage.getItem(tabColOrderKey) ?? localStorage.getItem(colOrderKey);
const tableHead = useRef();
const [colOrder, setColOrder] = useState(JSON.parse(localStorage.getItem(colOrderKey)) ?? {});
const [colOrder, setColOrder] = useState(defaultOrder ? JSON.parse(defaultOrder) : {});
const columns = prepareColumns(props.columns, props.hiddenColumns);
const Decoration = useMemo(() => Decorator(decoration), [decoration]);
const { api } = useSDK();

useEffect(() => {
localStorage.setItem(colOrderKey, JSON.stringify(colOrder));
const stringifiedColOrder = JSON.stringify(colOrder);

localStorage.setItem(colOrderKey, stringifiedColOrder);
localStorage.setItem(tabColOrderKey, stringifiedColOrder);
}, [colOrder]);

if (props.onSelectAll && props.onSelectRow) {
Expand Down
9 changes: 7 additions & 2 deletions src/components/Common/TableOld/Table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,20 @@ export const Table = observer(
...props
}) => {
const colOrderKey = 'dm:columnorder';
const tabColOrderKey = `dm:${window.DM.viewsStore.selected.id}:columnorder`;
const defaultOrder = localStorage.getItem(tabColOrderKey) ?? localStorage.getItem(colOrderKey);
const tableHead = useRef();
const [colOrder, setColOrder] = useState(JSON.parse(localStorage.getItem(colOrderKey)) ?? {});
const [colOrder, setColOrder] = useState(defaultOrder ? JSON.parse(defaultOrder) : {});
const listRef = useRef();
const columns = prepareColumns(props.columns, props.hiddenColumns);
const Decoration = useMemo(() => Decorator(decoration), [decoration]);
const { api } = useSDK();

useEffect(() => {
localStorage.setItem(colOrderKey, JSON.stringify(colOrder));
const stringifiedColOrder = JSON.stringify(colOrder);

localStorage.setItem(colOrderKey, stringifiedColOrder);
localStorage.setItem(tabColOrderKey, stringifiedColOrder);
}, [colOrder]);

if (props.onSelectAll && props.onSelectRow) {
Expand Down