WIP

twentyhq · Sep 12, 2024 · 8410e3b · 8410e3b
1 parent 9401a64
commit 8410e3b
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 77 deletions.
diff --git a/...s/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx b/...s/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
@@ -31,6 +31,7 @@ import { ViewType } from '@/views/types/ViewType';
 import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions';
 import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
 import { mapViewSortsToSorts } from '@/views/utils/mapViewSortsToSorts';
+import { useState } from 'react';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 
 const StyledContainer = styled.div`
@@ -57,6 +58,7 @@ export const RecordIndexContainer = ({
   recordIndexId,
   objectNamePlural,
 }: RecordIndexContainerProps) => {
+  const [currentViewId, setCurrentViewId] = useState<string | null>(null);
   const [recordIndexViewType, setRecordIndexViewType] = useRecoilState(
     recordIndexViewTypeState,
   );

diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsViewIdEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsViewIdEffect.tsx
@@ -39,13 +39,14 @@ export const QueryParamsViewIdEffect = () => {
     lastVisitedObjectMetadataItemId,
   );
 
+  // TODO: scope view bar per view id if possible
   const { resetCurrentView } = useResetCurrentView();
 
-  useEffect(() => {
-    if (isDefined(currentViewId)) {
-      resetCurrentView();
-    }
-  }, [resetCurrentView, currentViewId]);
+  // useEffect(() => {
+  //   if (isDefined(currentViewId)) {
+  //     resetCurrentView();
+  //   }
+  // }, [resetCurrentView, currentViewId]);
 
   useEffect(() => {
     const indexView = viewsOnCurrentObject.find((view) => view.key === 'INDEX');

diff --git a/packages/twenty-front/src/modules/views/hooks/useCombinedViewSorts.ts b/packages/twenty-front/src/modules/views/hooks/useCombinedViewSorts.ts
@@ -6,7 +6,7 @@ import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotV
 import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
 import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
 import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
-import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsFamilyState';
 import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
 import { ViewSort } from '@/views/types/ViewSort';
 import { isDefined } from '~/utils/isDefined';

diff --git a/packages/twenty-front/src/modules/views/hooks/useGetCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useGetCurrentView.ts
@@ -9,7 +9,7 @@ import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewCompon
 import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
 import { isCurrentViewKeyIndexComponentState } from '@/views/states/isCurrentViewIndexComponentState';
 import { unsavedToDeleteViewFilterIdsComponentState } from '@/views/states/unsavedToDeleteViewFilterIdsComponentState';
-import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsFamilyState';
 import { unsavedToUpsertViewFiltersComponentState } from '@/views/states/unsavedToUpsertViewFiltersComponentState';
 import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
 import { viewObjectMetadataIdComponentState } from '@/views/states/viewObjectMetadataIdComponentState';

diff --git a/packages/twenty-front/src/modules/views/hooks/useResetCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useResetCurrentView.ts
@@ -1,6 +1,6 @@
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { unsavedToDeleteViewFilterIdsComponentState } from '@/views/states/unsavedToDeleteViewFilterIdsComponentState';
-import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsFamilyState';
 import { unsavedToUpsertViewFiltersComponentState } from '@/views/states/unsavedToUpsertViewFiltersComponentState';
 import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
 

diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFiltersAndSorts.ts b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewFiltersAndSorts.ts
@@ -8,7 +8,7 @@ import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
 import { useResetCurrentView } from '@/views/hooks/useResetCurrentView';
 import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
 import { unsavedToDeleteViewFilterIdsComponentState } from '@/views/states/unsavedToDeleteViewFilterIdsComponentState';
-import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsFamilyState';
 import { unsavedToUpsertViewFiltersComponentState } from '@/views/states/unsavedToUpsertViewFiltersComponentState';
 import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
 import { isDefined } from '~/utils/isDefined';

diff --git a/...ectors/canPersistViewComponentSelector.ts → ...tates/selectors/canPersistViewSelector.ts b/...ectors/canPersistViewComponentSelector.ts → ...tates/selectors/canPersistViewSelector.ts
@@ -1,7 +1,7 @@
 import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2';
 import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
 import { unsavedToDeleteViewFilterIdsComponentState } from '@/views/states/unsavedToDeleteViewFilterIdsComponentState';
-import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsComponentState';
+import { unsavedToDeleteViewSortIdsComponentState } from '@/views/states/unsavedToDeleteViewSortIdsFamilyState';
 import { unsavedToUpsertViewFiltersComponentState } from '@/views/states/unsavedToUpsertViewFiltersComponentState';
 import { unsavedToUpsertViewSortsComponentState } from '@/views/states/unsavedToUpsertViewSortsComponentState';
 

diff --git a/packages/twenty-front/src/modules/views/states/selectors/canResetViewComponentSelector.ts b/packages/twenty-front/src/modules/views/states/selectors/canResetViewComponentSelector.ts
diff --git a/packages/twenty-front/src/modules/views/states/selectors/canResetViewSelector.ts b/packages/twenty-front/src/modules/views/states/selectors/canResetViewSelector.ts
@@ -0,0 +1,20 @@
+import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
+import { selectorFamily } from 'recoil';
+
+export const canResetViewSelector = selectorFamily({
+  key: 'canResetViewSelector',
+  get:
+    ({ viewId }: { viewId: string }) =>
+    ({ get }) => {
+      return (
+        get(unsavedToUpsertViewFiltersComponentFamilyState(viewId)).length ===
+          0 &&
+        get(unsavedToUpsertViewFiltersComponentFamilyState(viewId)).length ===
+          0 &&
+        get(unsavedToUpsertViewFiltersComponentFamilyState(viewId)).length ===
+          0 &&
+        get(unsavedToUpsertViewFiltersComponentFamilyState(viewId)).length === 0
+      );
+    },
+  instanceContext: ViewComponentInstanceContext,
+});
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewFilterIdsComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewFilterIdsComponentState.ts
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewFilterIdsFamilyState.ts b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewFilterIdsFamilyState.ts
@@ -0,0 +1,8 @@
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
+
+// TODO: turn this into a family state per view id
+export const unsavedToDeleteViewFilterIdsFamilyState =
+createFamilyState<string[], string>({
+    key: 'unsavedToDeleteViewFilterIdsFamilyState',
+    defaultValue: [],
+  });
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewSortIdsComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewSortIdsComponentState.ts
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewSortIdsFamilyState.ts b/packages/twenty-front/src/modules/views/states/unsavedToDeleteViewSortIdsFamilyState.ts
@@ -0,0 +1,7 @@
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
+
+export const unsavedToDeleteViewSortIdsFamilyState =
+createFamilyState<string[], string>({
+    key: 'unsavedToDeleteViewSortIdsFamilyState',
+    defaultValue: [],
+  });
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewFiltersComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewFiltersComponentState.ts
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewFiltersFamilyState.ts b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewFiltersFamilyState.ts
@@ -0,0 +1,8 @@
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
+import { ViewFilter } from '../types/ViewFilter';
+
+export const unsavedToUpsertViewFiltersFamilyState =
+createFamilyState<ViewFilter[], string>({
+    key: 'unsavedToUpsertViewFiltersFamilyState',
+    defaultValue: [],
+  });
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewSortsComponentState.ts b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewSortsComponentState.ts
diff --git a/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewSortsFamilyState.ts b/packages/twenty-front/src/modules/views/states/unsavedToUpsertViewSortsFamilyState.ts
@@ -0,0 +1,9 @@
+import { ViewSort } from '../types/ViewSort';
+
+export const unsavedToUpsertViewSortsFamilyState = createFamilyState<
+  ViewSort[],
+  string
+>({
+  key: 'unsavedToUpsertViewSortsFamilyState',
+  defaultValue: [],
+});