admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes (#2256)

Browse Source
This commit is contained in:
Lucas Bordeau
2023-10-27 11:25:14 +02:00
committed by GitHub
parent 3d5ee6d7ca
commit 1728045be4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
front/craco.config.js
View File

@ -22,7 +22,6 @@ module.exports = {
'@': path.resolve(__dirname, 'src/modules'), '@': path.resolve(__dirname, 'src/modules'),
'@testing': path.resolve(__dirname, 'src/testing'), '@testing': path.resolve(__dirname, 'src/testing'),
}, },
mode: 'extends',
// TODO: remove this workaround by resolving source map errors with @sniptt/guards // TODO: remove this workaround by resolving source map errors with @sniptt/guards
configure: { configure: {
module: { module: {

10
front/src/modules/metadata/components/ObjectDataTableEffect.tsx
View File

@ -36,10 +36,12 @@ export const ObjectDataTableEffect = ({
const tableRecoilScopeId = useRecoilScopeId(TableRecoilScopeContext); const tableRecoilScopeId = useRecoilScopeId(TableRecoilScopeContext);
const handleViewSelect = useRecoilCallback( const handleViewSelect = useRecoilCallback(
({ set, snapshot }) => ({ set, snapshot }) =>
(viewId: string) => { (viewId: string) => {
const currentView = snapshot.getLoadable( const currentView = snapshot
currentViewIdScopedState({ scopeId: tableRecoilScopeId }), .getLoadable(
).getValue() currentViewIdScopedState({ scopeId: tableRecoilScopeId }),
)
.getValue();
if (currentView === viewId) { if (currentView === viewId) {
return; return;

2
front/src/modules/views/hooks/internal/useViewFields.ts
View File

@ -4,6 +4,7 @@ import { useRecoilCallback } from 'recoil';
import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition'; import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata'; import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
import { GET_VIEWS } from '@/views/graphql/queries/getViews';
import { currentViewIdScopedState } from '@/views/states/currentViewIdScopedState'; import { currentViewIdScopedState } from '@/views/states/currentViewIdScopedState';
import { savedViewFieldByKeyScopedFamilySelector } from '@/views/states/selectors/savedViewFieldByKeyScopedFamilySelector'; import { savedViewFieldByKeyScopedFamilySelector } from '@/views/states/selectors/savedViewFieldByKeyScopedFamilySelector';
import { viewObjectIdScopeState } from '@/views/states/viewObjectIdScopeState'; import { viewObjectIdScopeState } from '@/views/states/viewObjectIdScopeState';
@ -13,7 +14,6 @@ import {
} from '~/generated/graphql'; } from '~/generated/graphql';
import { GET_VIEW_FIELDS } from '../../graphql/queries/getViewFields'; import { GET_VIEW_FIELDS } from '../../graphql/queries/getViewFields';
import { GET_VIEWS } from '@/views/graphql/queries/getViews';
export const toViewFieldInput = ( export const toViewFieldInput = (
objectId: string, objectId: string,