From 8ea4e6a51cb919a8592b273d253037cd91d4f691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tha=C3=AFs?= <guigon.thais@gmail.com>
Date: Mon, 11 Sep 2023 03:51:24 +0200
Subject: [PATCH] feat: reset table column resizing on ViewBar Cancel button
 click (#1520)

* feat: reset table column resizing on ViewBar Cancel button click

Closes #1500

* Fix according to PR

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
---
 .../table-header/components/TableHeader.tsx   | 22 +++++++----
 .../ui/view-bar/components/ViewBar.tsx        | 38 +++++--------------
 .../ui/view-bar/components/ViewBarDetails.tsx | 32 +++++++++++++---
 3 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/front/src/modules/ui/table/table-header/components/TableHeader.tsx b/front/src/modules/ui/table/table-header/components/TableHeader.tsx
index 9c464d795..be287c364 100644
--- a/front/src/modules/ui/table/table-header/components/TableHeader.tsx
+++ b/front/src/modules/ui/table/table-header/components/TableHeader.tsx
@@ -1,11 +1,12 @@
 import { useCallback } from 'react';
-import { useRecoilCallback, useRecoilValue, useSetRecoilState } from 'recoil';
+import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil';
 
 import { DropdownRecoilScopeContext } from '@/ui/dropdown/states/recoil-scope-contexts/DropdownRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { useContextScopeId } from '@/ui/utilities/recoil-scope/hooks/useContextScopeId';
+import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
-import { ViewBar, type ViewBarProps } from '@/ui/view-bar/components/ViewBar';
+import { ViewBar, ViewBarProps } from '@/ui/view-bar/components/ViewBar';
 import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState';
 
 import { TableOptionsDropdown } from '../../options/components/TableOptionsDropdown';
@@ -38,14 +39,18 @@ export function TableHeader<SortField>({
   const canPersistTableColumns = useRecoilValue(
     canPersistTableColumnsScopedFamilySelector([tableScopeId, currentViewId]),
   );
-  const tableColumns = useRecoilScopedValue(
+  const [tableColumns, setTableColumns] = useRecoilScopedState(
     tableColumnsScopedState,
     TableRecoilScopeContext,
   );
-  const setSavedTableColumns = useSetRecoilState(
+  const [savedTableColumns, setSavedTableColumns] = useRecoilState(
     savedTableColumnsFamilyState(currentViewId),
   );
 
+  function handleViewBarReset() {
+    setTableColumns(savedTableColumns);
+  }
+
   const handleViewSelect = useRecoilCallback(
     ({ set, snapshot }) =>
       async (viewId: string) => {
@@ -57,11 +62,13 @@ export function TableHeader<SortField>({
     [tableScopeId],
   );
 
-  const handleViewSubmit = async () => {
-    if (canPersistTableColumns) setSavedTableColumns(tableColumns);
+  async function handleViewSubmit() {
+    if (canPersistTableColumns) {
+      setSavedTableColumns(tableColumns);
+    }
 
     await onViewSubmit?.();
-  };
+  }
 
   const OptionsDropdownButton = useCallback(
     () => (
@@ -79,6 +86,7 @@ export function TableHeader<SortField>({
       <ViewBar
         {...props}
         canPersistViewFields={canPersistTableColumns}
+        onReset={handleViewBarReset}
         onViewSelect={handleViewSelect}
         onViewSubmit={handleViewSubmit}
         OptionsDropdownButton={OptionsDropdownButton}
diff --git a/front/src/modules/ui/view-bar/components/ViewBar.tsx b/front/src/modules/ui/view-bar/components/ViewBar.tsx
index 6a1a7a5c4..f1f1ca286 100644
--- a/front/src/modules/ui/view-bar/components/ViewBar.tsx
+++ b/front/src/modules/ui/view-bar/components/ViewBar.tsx
@@ -1,34 +1,27 @@
-import { ComponentProps, type ComponentType, type Context } from 'react';
-import { useRecoilValue } from 'recoil';
+import type { ComponentProps, ComponentType, Context } from 'react';
 
 import { useDropdownButton } from '@/ui/dropdown/hooks/useDropdownButton';
 import { TopBar } from '@/ui/top-bar/TopBar';
-import { useContextScopeId } from '@/ui/utilities/recoil-scope/hooks/useContextScopeId';
-import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 
-import { currentViewIdScopedState } from '../states/currentViewIdScopedState';
-import { canPersistFiltersScopedFamilySelector } from '../states/selectors/canPersistFiltersScopedFamilySelector';
-import { canPersistSortsScopedFamilySelector } from '../states/selectors/canPersistSortsScopedFamilySelector';
 import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope';
 import { ViewsHotkeyScope } from '../types/ViewsHotkeyScope';
 
 import { FilterDropdownButton } from './FilterDropdownButton';
 import {
   SortDropdownButton,
-  SortDropdownButtonProps,
+  type SortDropdownButtonProps,
 } from './SortDropdownButton';
 import {
   UpdateViewButtonGroup,
-  UpdateViewButtonGroupProps,
+  type UpdateViewButtonGroupProps,
 } from './UpdateViewButtonGroup';
-import ViewBarDetails from './ViewBarDetails';
+import ViewBarDetails, { type ViewBarDetailsProps } from './ViewBarDetails';
 import {
   ViewsDropdownButton,
-  ViewsDropdownButtonProps,
+  type ViewsDropdownButtonProps,
 } from './ViewsDropdownButton';
 
 export type ViewBarProps<SortField> = ComponentProps<'div'> & {
-  canPersistViewFields?: boolean;
   OptionsDropdownButton: ComponentType;
   optionsDropdownKey: string;
   scopeContext: Context<string | null>;
@@ -37,12 +30,14 @@ export type ViewBarProps<SortField> = ComponentProps<'div'> & {
     'defaultViewName' | 'onViewsChange' | 'onViewSelect'
   > &
   Pick<SortDropdownButtonProps<SortField>, 'availableSorts'> &
+  Pick<ViewBarDetailsProps, 'canPersistViewFields' | 'onReset'> &
   Pick<UpdateViewButtonGroupProps, 'onViewSubmit'>;
 
 export const ViewBar = <SortField,>({
   availableSorts,
   canPersistViewFields,
   defaultViewName,
+  onReset,
   onViewsChange,
   onViewSelect,
   onViewSubmit,
@@ -51,19 +46,6 @@ export const ViewBar = <SortField,>({
   scopeContext,
   ...props
 }: ViewBarProps<SortField>) => {
-  const recoilScopeId = useContextScopeId(scopeContext);
-
-  const currentViewId = useRecoilScopedValue(
-    currentViewIdScopedState,
-    scopeContext,
-  );
-  const canPersistFilters = useRecoilValue(
-    canPersistFiltersScopedFamilySelector([recoilScopeId, currentViewId]),
-  );
-  const canPersistSorts = useRecoilValue(
-    canPersistSortsScopedFamilySelector([recoilScopeId, currentViewId]),
-  );
-
   const { openDropdownButton: openOptionsDropdownButton } = useDropdownButton({
     key: optionsDropdownKey,
   });
@@ -100,13 +82,13 @@ export const ViewBar = <SortField,>({
       }
       bottomComponent={
         <ViewBarDetails
-          canPersistView={
-            canPersistViewFields || canPersistFilters || canPersistSorts
-          }
+          canPersistViewFields={canPersistViewFields}
           context={scopeContext}
           hasFilterButton
+          onReset={onReset}
           rightComponent={
             <UpdateViewButtonGroup
+              canPersistViewFields={canPersistViewFields}
               onViewEditModeChange={openOptionsDropdownButton}
               onViewSubmit={onViewSubmit}
               hotkeyScope={ViewsHotkeyScope.CreateDropdown}
diff --git a/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx b/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx
index ceae524c0..fe916586a 100644
--- a/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx
+++ b/front/src/modules/ui/view-bar/components/ViewBarDetails.tsx
@@ -1,18 +1,24 @@
 import type { Context, ReactNode } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
 
 import {
   IconArrowNarrowDown,
   IconArrowNarrowUp,
   IconPlus,
 } from '@/ui/icon/index';
+import { useContextScopeId } from '@/ui/utilities/recoil-scope/hooks/useContextScopeId';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
+import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 
 import { useRemoveFilter } from '../hooks/useRemoveFilter';
 import { availableFiltersScopedState } from '../states/availableFiltersScopedState';
+import { currentViewIdScopedState } from '../states/currentViewIdScopedState';
 import { filtersScopedState } from '../states/filtersScopedState';
 import { isViewBarExpandedScopedState } from '../states/isViewBarExpandedScopedState';
+import { canPersistFiltersScopedFamilySelector } from '../states/selectors/canPersistFiltersScopedFamilySelector';
+import { canPersistSortsScopedFamilySelector } from '../states/selectors/canPersistSortsScopedFamilySelector';
 import { sortsScopedState } from '../states/sortsScopedState';
 import { FiltersHotkeyScope } from '../types/FiltersHotkeyScope';
 import { SelectedSortType } from '../types/interface';
@@ -21,10 +27,11 @@ import { getOperandLabelShort } from '../utils/getOperandLabel';
 import { FilterDropdownButton } from './FilterDropdownButton';
 import SortOrFilterChip from './SortOrFilterChip';
 
-type OwnProps = {
-  canPersistView?: boolean;
+export type ViewBarDetailsProps = {
+  canPersistViewFields?: boolean;
   context: Context<string | null>;
   hasFilterButton?: boolean;
+  onReset?: () => void;
   rightComponent?: ReactNode;
 };
 
@@ -96,13 +103,18 @@ const StyledAddFilterContainer = styled.div`
 `;
 
 function ViewBarDetails<SortField>({
-  canPersistView,
+  canPersistViewFields,
   context,
   hasFilterButton = false,
+  onReset,
   rightComponent,
-}: OwnProps) {
+}: ViewBarDetailsProps) {
   const theme = useTheme();
 
+  const recoilScopeId = useContextScopeId(context);
+
+  const currentViewId = useRecoilScopedValue(currentViewIdScopedState, context);
+
   const [filters, setFilters] = useRecoilScopedState(
     filtersScopedState,
     context,
@@ -111,11 +123,20 @@ function ViewBarDetails<SortField>({
     availableFiltersScopedState,
     context,
   );
+  const canPersistFilters = useRecoilValue(
+    canPersistFiltersScopedFamilySelector([recoilScopeId, currentViewId]),
+  );
 
   const [sorts, setSorts] = useRecoilScopedState<SelectedSortType<SortField>[]>(
     sortsScopedState,
     context,
   );
+  const canPersistSorts = useRecoilValue(
+    canPersistSortsScopedFamilySelector([recoilScopeId, currentViewId]),
+  );
+
+  const canPersistView =
+    canPersistViewFields || canPersistFilters || canPersistSorts;
 
   const [isViewBarExpanded] = useRecoilScopedState(
     isViewBarExpandedScopedState,
@@ -136,6 +157,7 @@ function ViewBarDetails<SortField>({
   const removeFilter = useRemoveFilter(context);
 
   function handleCancelClick() {
+    onReset?.();
     setFilters([]);
     setSorts([]);
   }
@@ -207,7 +229,7 @@ function ViewBarDetails<SortField>({
           </StyledAddFilterContainer>
         )}
       </StyledFilterContainer>
-      {filters.length + sorts.length > 0 && (
+      {(filters.length + sorts.length > 0 || canPersistViewFields) && (
         <StyledCancelButton
           data-testid="cancel-button"
           onClick={handleCancelClick}