fix payload when you create a new view from a shared one (#98)

customeros · Feb 28, 2025 · 3c5d139 · 3c5d139
1 parent 02e6811
commit 3c5d139
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/src/routes/finder/src/components/FiltersContainer/FiltersContainer.tsx b/src/routes/finder/src/components/FiltersContainer/FiltersContainer.tsx
@@ -27,7 +27,6 @@ export const FiltersContainer = observer(() => {
   const tableViewType = tableViewDef?.value.tableType;
 
   const tableType = tableViewDef?.value?.tableType;
-  const isPreset = tableViewDef?.value?.isPreset;
   const filters = tableViewDef?.getFilters()?.AND?.length > 0;
 
   const handleAddToMyViews: MouseEventHandler<HTMLButtonElement> = (e) => {
@@ -77,36 +76,40 @@ export const FiltersContainer = observer(() => {
           store.ui.isEditingDefaultFilters && 'bg-grayModern-50',
         )}
       >
+        {tableViewDef?.hasFilters() && !store.ui.isEditingDefaultFilters && (
+          <>
+            <Button
+              size='xs'
+              variant='ghost'
+              onClick={() => tableViewDef?.removeFilters()}
+            >
+              Clear
+            </Button>
+            {filters && (
+              <Button size='xs' onClick={handleAddToMyViews}>
+                Save to...
+              </Button>
+            )}
+            <Divider className='rotate-90 w-5 mx-[-6px]' />
+          </>
+        )}
         {tableViewDef?.hasDefaultFilters() &&
           !store.ui.isEditingDefaultFilters && (
             <>
               <Button
                 size='xs'
+                variant='ghost'
+                colorScheme='grayModern'
                 onClick={() => store.ui.setIsEditingDefaultFilters(true)}
                 leftIcon={<Icon className='size-4' name='filter-lines' />}
               >
                 {tableViewDef.getNumberOfDefaultFilters()} default
               </Button>
-              <Divider className='rotate-90 w-5 mx-[-6px]' />
             </>
           )}
 
         {!store.ui.isEditingDefaultFilters && (
           <>
-            {tableViewDef?.hasFilters() && (
-              <Button
-                size='xs'
-                variant='ghost'
-                onClick={() => tableViewDef?.removeFilters()}
-              >
-                Clear
-              </Button>
-            )}
-            {isPreset && filters && (
-              <Button size='xs' onClick={handleAddToMyViews}>
-                Save to...
-              </Button>
-            )}
             {filters && <Divider className='rotate-90 w-5 mx-[-6px]' />}
             {tableViewType && (
               <ViewSettings tableId={tableId} type={tableViewType} />

diff --git a/src/routes/src/components/ContactDetails/ContactDetails.tsx b/src/routes/src/components/ContactDetails/ContactDetails.tsx
@@ -197,7 +197,7 @@ export const ContactDetails = observer(
                           dataTest='org-people-contact-name'
                           onFocus={(e) => e.target.select()}
                           onKeyDown={(e) => e.stopPropagation()}
-                          className='placeholder:font-medium font-medium min-w-[60px] w-[200px]'
+                          className='placeholder:font-medium font-medium min-w-[60px] w-[300px]'
                           onBlur={() => {
                             contactDetails.changeContactName();
                           }}

diff --git a/src/store/TableViewDefs/TableViewDef.store.ts b/src/store/TableViewDefs/TableViewDef.store.ts
@@ -227,6 +227,9 @@ export class TableViewDefStore extends Store<TableViewDefDatum, TableViewDef> {
   ) => {
     const favoritePreset = this.getById(id)?.getPayloadToCopy();
 
+    const favoriteDefaultFilters = this.getById(id)?.getDefaultFilters().AND;
+    const favoriteFilters = this.getById(id)?.getFilters().AND;
+
     const newTableViewDef = new TableViewDef(
       this,
       TableViewDef.default({
@@ -241,7 +244,9 @@ export class TableViewDefStore extends Store<TableViewDefDatum, TableViewDef> {
         isPreset: false,
         isShared,
         filters: '',
-        defaultFilters: favoritePreset?.filters || '',
+        defaultFilters: JSON.stringify({
+          AND: [...favoriteDefaultFilters, ...favoriteFilters],
+        }),
       }),
     );