refactor: moved functionality to util

Author: Ruslan

src/utils/create-entity-api-utils.ts

@@ -11,6 +11,7 @@ import {
   EntityQueryEndpointName,
 } from '../types';
 import { createEntityInstance } from './create-entity-instance';
+import { findEntityInPages } from './find-entity-in-pages';
 import { mergeEntity } from './merge-entity';
 
 export const createEntityApiUtils = <
@@ -88,22 +89,11 @@ export const createEntityApiUtils = <
                 );
               }
             } else if ('pages' in endpointData && Array.isArray(endpointData.pages)) {
-              let existingItemIndex = -1;
-              const existingPageIndex = endpointData.pages.findIndex((page) => {
-                const itemIndex = page.data.findIndex((item) => item.id === entityData.id);
+              const { pageIndex, itemIndex } = findEntityInPages(endpointData.pages, entityData.id);
 
-                if (itemIndex !== -1) {
-                  existingItemIndex = itemIndex;
-
-                  return true;
-                }
-
-                return false;
-              });
-
-              if (existingPageIndex > -1 && existingItemIndex > -1) {
-                endpointData.pages[existingPageIndex].data[existingItemIndex] = mergeEntity(
-                  endpointData.pages[existingPageIndex].data[existingItemIndex],
+              if (pageIndex > -1 && itemIndex > -1) {
+                endpointData.pages[pageIndex].data[itemIndex] = mergeEntity(
+                  endpointData.pages[pageIndex].data[itemIndex],
                   existingEntity,
                 );
               }
@@ -155,21 +145,10 @@ export const createEntityApiUtils = <
                 endpointData.pagination.total--;
               }
             } else if ('pages' in endpointData && Array.isArray(endpointData.pages)) {
-              let existingItemIndex = -1;
-              const existingPageIndex = endpointData.pages.findIndex((page) => {
-                const itemIndex = page.data.findIndex((item) => item.id === id);
-
-                if (itemIndex !== -1) {
-                  existingItemIndex = itemIndex;
-
-                  return true;
-                }
-
-                return false;
-              });
+              const { pageIndex, itemIndex } = findEntityInPages(endpointData.pages, id);
 
-              if (existingPageIndex > -1 && existingItemIndex > -1) {
-                endpointData.pages[existingPageIndex].data.splice(existingItemIndex, 1);
+              if (pageIndex > -1 && itemIndex > -1) {
+                endpointData.pages[pageIndex].data.splice(itemIndex, 1);
                 endpointData.pages.filter((pages) => !!pages.data.length);
 
                 for (let i = 0; i < endpointData.pages.length; i++) {

src/utils/find-entity-in-pages.ts

@@ -1,18 +1,26 @@
-// export const findEntityInPages = (
-//   pages: Array<any>,
-//   entityId: unknown,
-// ): { pageIndex: number; itemIndex: number } | null => {
-//   let existingItemIndex = -1;
+import { Draft } from 'immer';
+import { BaseEntity, PaginationResponse } from '../models';
 
-//   const existingPageIndex = pages.findIndex((page) => {
-//     const itemIndex = page.data.findIndex((item: { id: unkown }) => item.id === entityId);
+export const findEntityInPages = <
+  TEntity extends BaseEntity,
+  TSearchResponse extends PaginationResponse<TEntity> = PaginationResponse<TEntity>,
+>(
+  pages: Array<TSearchResponse> | Draft<Array<TSearchResponse>>,
+  entityId: unknown,
+): { pageIndex: number; itemIndex: number } => {
+  let itemIndex = -1;
 
-//     if (itemIndex !== -1) {
-//       existingItemIndex = itemIndex;
+  const pageIndex = pages.findIndex((page) => {
+    const foundItemIndex = page.data.findIndex((item: { id: unknown }) => item.id === entityId);
 
-//       return true;
-//     }
+    if (itemIndex !== -1) {
+      itemIndex = foundItemIndex;
 
-//     return false;
-//   });
-// };
+      return true;
+    }
+
+    return false;
+  });
+
+  return { itemIndex, pageIndex };
+};

src/utils/index.ts

@@ -12,4 +12,5 @@ export * from './merge-entity';
 export * from './prepare-request-params';
 export * from './prepare-server-side-request-headers';
 export * from './setup-refetch-listeners';
+export * from './find-entity-in-pages';
 export * from './store';