feat(admin): add reset filters button

DashHub-ai · Oct 12, 2024 · f91668d · f91668d
1 parent e2ef007
commit f91668d
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 9 deletions.
diff --git a/apps/admin/src/components/predefined/buttons/index.ts b/apps/admin/src/components/predefined/buttons/index.ts
@@ -1,6 +1,7 @@
 export * from './archive-button';
 export * from './cancel-button';
 export * from './create-button';
+export * from './reset-filters-button';
 export * from './save-button';
 export * from './unarchive-button';
 export * from './update-button';
diff --git a/apps/admin/src/components/predefined/buttons/reset-filters-button.tsx b/apps/admin/src/components/predefined/buttons/reset-filters-button.tsx
@@ -0,0 +1,19 @@
+import clsx from 'clsx';
+
+import { useI18n } from '~/i18n';
+
+type Props = Omit<JSX.IntrinsicElements['button'], 'children'>;
+
+export function ResetFiltersButton({ className, ...props }: Props) {
+  const { pack } = useI18n();
+
+  return (
+    <button
+      type="button"
+      className={clsx('uk-button uk-button-default', className)}
+      {...props}
+    >
+      {pack.buttons.resetFilters}
+    </button>
+  );
+}
diff --git a/apps/admin/src/components/table/use-debounced-paginated-search.ts b/apps/admin/src/components/table/use-debounced-paginated-search.ts
@@ -94,9 +94,15 @@ export function useDebouncedPaginatedSearch<
   };
 
   const reset = () => {
+    const { initialState } = urlPagination;
+
     pagination.setValue({
       value: {
-        ...urlPagination.initialState,
+        offset: 0,
+        limit: initialState?.limit ?? 10,
+        ...'archived' in initialState && {
+          archived: false,
+        },
         __revision: Date.now(),
       },
     });

diff --git a/apps/admin/src/i18n/packs/i18n-lang-en.ts b/apps/admin/src/i18n/packs/i18n-lang-en.ts
@@ -81,6 +81,7 @@ export const I18N_PACK_EN = {
     update: 'Update',
     add: 'Add',
     confirm: 'Confirm',
+    resetFilters: 'Reset filters',
   },
   badges: {
     archive: {

diff --git a/apps/admin/src/i18n/packs/i18n-lang-pl.ts b/apps/admin/src/i18n/packs/i18n-lang-pl.ts
@@ -55,6 +55,7 @@ export const I18N_PACK_PL: I18nLangPack = {
     update: 'Aktualizuj',
     add: 'Dodaj',
     confirm: 'Potwierdź',
+    resetFilters: 'Resetuj filtry',
   },
   badges: {
     archive: {

diff --git a/apps/admin/src/modules/organizations/table/organizations-table-container.tsx b/apps/admin/src/modules/organizations/table/organizations-table-container.tsx
@@ -11,6 +11,7 @@ import {
   PaginatedTable,
   PaginationSearchToolbarItem,
   PaginationToolbar,
+  ResetFiltersButton,
   useDebouncedPaginatedSearch,
 } from '~/components';
 import { useI18n } from '~/i18n';
@@ -61,6 +62,8 @@ export function OrganizationsTableContainer() {
             }),
           })}
         />
+
+        <ResetFiltersButton onClick={reset} />
       </PaginationToolbar>
 
       <PaginatedTable

diff --git a/apps/admin/src/modules/users/table/users-table-container.tsx b/apps/admin/src/modules/users/table/users-table-container.tsx
@@ -11,6 +11,7 @@ import {
   PaginatedTable,
   PaginationSearchToolbarItem,
   PaginationToolbar,
+  ResetFiltersButton,
   useDebouncedPaginatedSearch,
 } from '~/components';
 import { genRandomPassword } from '~/helpers';
@@ -99,6 +100,8 @@ export function UsersTableContainer() {
           prefix={pack.modules.organizations.prefix.organization}
           {...pagination.bind.path('organization')}
         />
+
+        <ResetFiltersButton onClick={reset} />
       </PaginationToolbar>
 
       <PaginatedTable

diff --git a/apps/admin/src/modules/users/table/users-table-row.tsx b/apps/admin/src/modules/users/table/users-table-row.tsx
@@ -31,7 +31,10 @@ export function UsersTableRow({ item, onUpdated }: Props) {
         {(
           item.role === 'user'
             ? (
-                <Link className="uk-link" href={sitemap.organizations.edit(item.organization.id)}>
+                <Link
+                  className="uk-link"
+                  href={sitemap.organizations.show(item.organization.id)}
+                >
                   {item.organization.name}
                 </Link>
               )

diff --git a/apps/admin/src/routes/use-sitemap.ts b/apps/admin/src/routes/use-sitemap.ts
@@ -20,10 +20,10 @@ export function useSitemap() {
     home: '/',
     login: '/login',
     organizations: {
-      index: defineRouteGenerator<SearchOrganizationsRouteUrlFiltersT, 'edit'>()('/organizations'),
-      edit: (id: SdkTableRowIdT) => sitemap.organizations.index.generate({
-        hash: 'edit',
+      index: defineRouteGenerator<SearchOrganizationsRouteUrlFiltersT>()('/organizations'),
+      show: (id: SdkTableRowIdT) => sitemap.organizations.index.generate({
         searchParams: {
+          archived: null,
           ids: [id],
         },
       }),
@@ -50,10 +50,6 @@ function defineRouteGenerator<
         ? parameterizeStrictPath(schema, pathParams)
         : schema,
 
-      hash
-        ? withHash(hash)
-        : identity,
-
       searchParams || defaultSearchParams
         ? withSearchParams(
           {
@@ -62,6 +58,10 @@ function defineRouteGenerator<
           },
         )
         : identity,
+
+      hash
+        ? withHash(hash)
+        : identity,
     ),
   });
 }