refactor: remove useModelGist

dhis2 · Nov 27, 2023 · af5b5d6 · af5b5d6
1 parent 883a9bc
commit af5b5d6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 227 deletions.
diff --git a/src/components/sectionList/SectionListPagination.tsx b/src/components/sectionList/SectionListPagination.tsx
@@ -5,14 +5,13 @@ import {
     NumericObjectParam,
     withDefault,
 } from 'use-query-params'
-import { GistPaginator } from '../../lib/'
 import { Pager } from '../../types/generated'
 
 type SectionListPaginationProps = {
     pager: Pager | undefined
 }
 
-type PaginationQueryParams = {
+export type PaginationQueryParams = {
     page: number
     pageSize: number
 }
@@ -67,16 +66,15 @@ const validatePagerParams = (
     }
 }
 
-function useUpdatePaginationParams(pager?: Pager): GistPaginator {
-    const [, setParams] = usePaginationQueryParams()
+type Paginator = {
+    changePageSize: (pageSize: number) => boolean
+    getPrevPage: () => boolean
+    goToPage: (page: number) => boolean
+    pager?: Pager
+}
 
-    const getNextPage = useCallback(() => {
-        if (!pager?.nextPage) {
-            return false
-        }
-        setParams((prevPager) => ({ ...prevPager, page: pager.page + 1 }))
-        return true
-    }, [pager, setParams])
+function useUpdatePaginationParams(pager?: Pager): Paginator {
+    const [, setParams] = usePaginationQueryParams()
 
     const getPrevPage = useCallback(() => {
         if (!pager?.prevPage) {
@@ -106,7 +104,6 @@ function useUpdatePaginationParams(pager?: Pager): GistPaginator {
     )
 
     return {
-        getNextPage,
         getPrevPage,
         goToPage,
         changePageSize,

diff --git a/src/components/sectionList/filters/useSectionListFilter.ts b/src/components/sectionList/filters/useSectionListFilter.ts
@@ -1,11 +1,6 @@
 import { useCallback, useMemo } from 'react'
 import { useQueryParam, ObjectParam, UrlUpdateType } from 'use-query-params'
-import {
-    Schema,
-    useSchemaFromHandle,
-    CustomObjectParam,
-    GistParams,
-} from '../../../lib'
+import { Schema, useSchemaFromHandle, CustomObjectParam } from '../../../lib'
 import { usePaginationQueryParams } from '../SectionListPagination'
 
 type ObjectParamType = typeof ObjectParam.default
@@ -17,21 +12,6 @@ type Filters = Record<string, string | undefined>
 // this would translate to "token" in the old API, but does not exist in GIST-API
 export const IDENTIFIABLE_KEY = 'identifiable'
 
-const IDENTIFIABLE_FIELDS = {
-    name: {
-        operator: 'ilike',
-    },
-    code: {
-        operator: 'ilike',
-    },
-    shortName: {
-        operator: 'ilike',
-    },
-    id: {
-        operator: 'eq',
-    },
-}
-
 const getVerifiedFiltersForSchema = (
     filters: ObjectParamType,
     schema: Schema

diff --git a/src/lib/models/index.ts b/src/lib/models/index.ts
@@ -1,10 +1,3 @@
-export { useModelGist } from './useModelGist'
-export type {
-    GistPaginator,
-    GistParams,
-    UseModelGistResultPaginated,
-    UseModelGistResult,
-} from './useModelGist'
 export { isValidUid } from './uid'
 export { parsePublicAccessString } from './parsePublicAccess'
 export { getIn, stringToPathArray, getFieldFilterFromPath } from './path'
diff --git a/src/lib/models/useModelGist.ts b/src/lib/models/useModelGist.ts