feat: order by default campaign first and fix an issue for nullish value

getlago · Oct 30, 2024 · 6067a6c · 6067a6c
1 parent 6198ac9
commit 6067a6c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/components/customers/EditCustomerDunningCampaignDialog.tsx b/src/components/customers/EditCustomerDunningCampaignDialog.tsx
@@ -186,6 +186,7 @@ export const EditCustomerDunningCampaignDialog = forwardRef<
                 value: campaign.id,
               })) ?? []
             }
+            isEmptyNull={false}
             placeholder={translate('text_1729543690326d4dmmcw7n89')}
             PopperProps={{ displayInDialog: true }}
           />

diff --git a/src/pages/settings/Dunnings/Dunnings.tsx b/src/pages/settings/Dunnings/Dunnings.tsx
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client'
-import { useRef } from 'react'
+import { useMemo, useRef } from 'react'
 import { useNavigate } from 'react-router-dom'
 
 import {
@@ -102,6 +102,15 @@ const Dunnings = () => {
     },
   })
 
+  const sortedTable = useMemo(
+    () =>
+      [...(data?.dunningCampaigns.collection ?? [])].sort((a) => {
+        // Put items with appliedToOrganization: true first
+        return a.appliedToOrganization ? -1 : 1
+      }),
+    [data?.dunningCampaigns.collection],
+  )
+
   if (!!error && !loading) {
     return (
       <GenericPlaceholder
@@ -200,7 +209,7 @@ const Dunnings = () => {
                       containerSize={{ default: 0 }}
                       rowSize={72}
                       isLoading={loading}
-                      data={data.dunningCampaigns.collection}
+                      data={sortedTable}
                       columns={[
                         {
                           key: 'name',