refactor(integrations/api): crud module [wip]

ladesa-ro · Feb 6, 2025 · f5a02da · f5a02da
1 parent ea42729
commit f5a02da
Show file tree

Hide file tree

Showing 53 changed files with 175 additions and 398 deletions.
diff --git a/sistemas/principal/app/components/Section/Ambientes/Ambientes.vue b/sistemas/principal/app/components/Section/Ambientes/Ambientes.vue
@@ -2,15 +2,9 @@
 import { createApiListContextOptions } from '~/components/UI/API/List/Context/UIApiListContext';
 import { useLadesaApiCrudAmbientes } from '../../../composables/integrations/ladesa-api/modules/modules';
 
-const {
-  crudModule,
-  composables: { useList },
-} = useLadesaApiCrudAmbientes();
+const { crudModule } = useLadesaApiCrudAmbientes();
 
-const options = createApiListContextOptions({
-  baseQueryKey: crudModule.baseQueryKeys,
-  apiBaseResourceListRetriever: useList(),
-});
+const options = createApiListContextOptions({ crudModule });
 </script>
 
 <template>

diff --git a/sistemas/principal/app/components/Section/Ambientes/Form/Form.vue b/sistemas/principal/app/components/Section/Ambientes/Form/Form.vue
@@ -25,7 +25,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudAmbientes();
 
-const { data: currentAmbiente } = await useFindOneQuery()(editIdRef);
+const { data: currentAmbiente } = await useFindOneQuery(editIdRef);
 
 type FormValues = {
   imagem: Blob | null | undefined;

diff --git a/sistemas/principal/app/components/Section/Blocos/Blocos.vue b/sistemas/principal/app/components/Section/Blocos/Blocos.vue
@@ -1,12 +1,9 @@
 <script setup lang="ts">
 import { createApiListContextOptions } from '~/components/UI/API/List/Context/UIApiListContext';
 
-const blocosRetriever = useBlocosRetriever();
+const { crudModule } = useLadesaApiCrudBlocos();
 
-const options = createApiListContextOptions({
-  baseQueryKey: ['blocos'],
-  apiBaseResourceListRetriever: blocosRetriever,
-});
+const options = createApiListContextOptions({ crudModule });
 </script>
 
 <template>

diff --git a/sistemas/principal/app/components/Section/Blocos/Form/Form.vue b/sistemas/principal/app/components/Section/Blocos/Form/Form.vue
@@ -23,7 +23,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudBlocos();
 
-const { data: currentBloco } = await useFindOneQuery()(editIdRef);
+const { data: currentBloco } = await useFindOneQuery(editIdRef);
 
 type FormValues = {
   imagem: Blob | null | undefined;

diff --git a/sistemas/principal/app/components/Section/Calendario/Forms/Form1.vue b/sistemas/principal/app/components/Section/Calendario/Forms/Form1.vue
@@ -33,7 +33,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudCursos();
 
-const { data: currentCurso } = await useFindOneQuery()(editIdRef);
+const { data: currentCurso } = await useFindOneQuery(editIdRef);
 
 type FormValues = {
   imagem: Blob | null | undefined;

diff --git a/sistemas/principal/app/components/Section/Cursos/Cursos.vue b/sistemas/principal/app/components/Section/Cursos/Cursos.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
 import { createApiListContextOptions } from '~/components/UI/API/List/Context/UIApiListContext';
 import CursosForm from './Form/Form.vue';
-const cursosRetriever = useCursosRetriever();
 
-const options = createApiListContextOptions({
-  baseQueryKey: cursosBaseQueryKey,
-  apiBaseResourceListRetriever: cursosRetriever,
-});
+const { crudModule } = useLadesaApiCrudCursos();
+
+const options = createApiListContextOptions({ crudModule });
 </script>
 
 <template>

diff --git a/sistemas/principal/app/components/Section/Cursos/Form/Form.vue b/sistemas/principal/app/components/Section/Cursos/Form/Form.vue
@@ -25,7 +25,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudCursos();
 
-const { data: currentCurso } = await useFindOneQuery()(editIdRef);
+const { data: currentCurso } = await useFindOneQuery(editIdRef);
 
 type FormValues = {
   imagem: Blob | null | undefined;

diff --git a/...rincipal/app/components/Section/Diarios/Form/Geral/Disciplina/Turmas/DisciplinaTurmas.vue b/...rincipal/app/components/Section/Diarios/Form/Geral/Disciplina/Turmas/DisciplinaTurmas.vue
@@ -14,8 +14,9 @@ const {
   composables: { useListQuery: useListQueryDiariosProfessores },
 } = useLadesaApiCrudDiariosProfessores();
 
-const { items: diariosProfessoresList } =
-  await useListQueryDiariosProfessores()({});
+const { items: diariosProfessoresList } = await useListQueryDiariosProfessores(
+  {}
+);
 
 //
 
@@ -61,7 +62,7 @@ const queries = computed(() => ({
   filterDisciplinaId: [disciplinaId.value!],
 }));
 
-const { items: diarios } = await useListQuery()(queries);
+const { items: diarios } = await useListQuery(queries);
 </script>
 
 <template>

diff --git a/sistemas/principal/app/components/Section/Diarios/Grid/Grid.vue b/sistemas/principal/app/components/Section/Diarios/Grid/Grid.vue
@@ -17,7 +17,7 @@ const {
 
 const queries = computed(() => ({ search: searchBarText }));
 
-const { items: diarios } = await useListQuery()(queries);
+const { items: diarios } = await useListQuery(queries);
 </script>
 
 <template>

diff --git a/sistemas/principal/app/components/Section/Diarios/Grid/Item/Item.vue b/sistemas/principal/app/components/Section/Diarios/Grid/Item/Item.vue
@@ -19,7 +19,7 @@ const {
 const options = computed(() => ({ filterDiarioId: [diario.value.id] }));
 
 const { items: diariosProfessoresList } =
-  await useListQueryDiariosProfessores()(options);
+  await useListQueryDiariosProfessores(options);
 
 //
 

diff --git a/sistemas/principal/app/components/Section/Disciplinas/Disciplinas.vue b/sistemas/principal/app/components/Section/Disciplinas/Disciplinas.vue
@@ -2,12 +2,9 @@
 import { createApiListContextOptions } from '~/components/UI/API/List/Context/UIApiListContext';
 import DisciplinasForm from './Form/Form.vue';
 
-const disciplinasRetriever = useDisciplinasRetriever();
+const { crudModule } = useLadesaApiCrudDisciplinas();
 
-const options = createApiListContextOptions({
-  baseQueryKey: disciplinasBaseQueryKey,
-  apiBaseResourceListRetriever: disciplinasRetriever,
-});
+const options = createApiListContextOptions({ crudModule });
 </script>
 
 <template>

diff --git a/sistemas/principal/app/components/Section/Disciplinas/Form/Form.vue b/sistemas/principal/app/components/Section/Disciplinas/Form/Form.vue
@@ -25,7 +25,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudDisciplinas();
 
-const { data: currentDisciplina } = await useFindOneQuery()(editIdRef);
+const { data: currentDisciplina } = await useFindOneQuery(editIdRef);
 
 type FormValues = {
   imagem: Blob | null | undefined;

diff --git a/sistemas/principal/app/components/Section/Turmas/Form/Fields/Periodo/Periodo.vue b/sistemas/principal/app/components/Section/Turmas/Form/Fields/Periodo/Periodo.vue
@@ -24,7 +24,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudCursos();
 
-const { data: cursoSelecionado, query } = await useFindOneQuery()(cursoId, {
+const { data: cursoSelecionado, query } = await useFindOneQuery(cursoId, {
   mode: QuerySuspenseBehaviourMode.NEVER_WAIT,
 });
 

diff --git a/sistemas/principal/app/components/Section/Turmas/Turmas.vue b/sistemas/principal/app/components/Section/Turmas/Turmas.vue
@@ -2,12 +2,9 @@
 import { createApiListContextOptions } from '~/components/UI/API/List/Context/UIApiListContext';
 import TurmasForm from './Form/Form.vue';
 
-const turmasRetriever = useTurmasRetriever();
+const { crudModule } = useLadesaApiCrudTurmas();
 
-const options = createApiListContextOptions({
-  baseQueryKey: turmasBaseQueryKey,
-  apiBaseResourceListRetriever: turmasRetriever,
-});
+const options = createApiListContextOptions({ crudModule });
 </script>
 
 <template>

diff --git a/...incipal/app/components/Section/Usuarios/Form/Availabilities/Availability/Availability.vue b/...incipal/app/components/Section/Usuarios/Form/Availabilities/Availability/Availability.vue
@@ -7,7 +7,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudCampi();
 
-const { data: campus } = await useFindOneQuery()(props.vinculo.campus.id);
+const { data: campus } = await useFindOneQuery(props.vinculo.campus.id);
 
 const horarios = {
   matutino: ['07:30', '08:20', '09:10', '10:00', '10:20', '11:10'],

diff --git a/sistemas/principal/app/components/Section/Usuarios/Form/Form.vue b/sistemas/principal/app/components/Section/Usuarios/Form/Form.vue
@@ -24,7 +24,7 @@ const {
   composables: { useFindOneQuery },
 } = useLadesaApiCrudUsuarios();
 
-const { data: currentUsuario } = await useFindOneQuery()(editIdRef);
+const { data: currentUsuario } = await useFindOneQuery(editIdRef);
 
 const { vinculosAtivos } = await useApiUsuarioPerfisAtivos(editIdRef);
 

diff --git a/sistemas/principal/app/components/Section/Usuarios/Grid/Grid.vue b/sistemas/principal/app/components/Section/Usuarios/Grid/Grid.vue
@@ -19,7 +19,7 @@ const {
 
 const queries = computed(() => ({ search: searchBarText.value }));
 
-const { items: usuarios } = await useListQuery()(queries);
+const { items: usuarios } = await useListQuery(queries);
 </script>
 
 <template>

diff --git a/sistemas/principal/app/components/UI/API/List/Context/UIApiListContext.ts b/sistemas/principal/app/components/UI/API/List/Context/UIApiListContext.ts
@@ -1,3 +1,7 @@
+import type {
+  IGenericCrudModule,
+  IGenericCrudModuleTypes,
+} from '../../../../../utils';
 
 const SYMBOL_EMPTY = Symbol.for('empty');
 const STORE_KEY = 'UI_API_LIST_CONTEXT';
@@ -8,21 +12,23 @@ export enum UIApiListViewMode {
 
 export type UIApiListContext = ReturnType<typeof createUIApiListContext>;
 
-export type ICreateUIApiListContextOptions<ResultItemDto = any> = {
-  baseQueryKey: MaybeRef<any>[] | MaybeRef<any>;
-  apiBaseResourceListRetriever: IApiBaseResourceListRetriever<ResultItemDto>;
+export type ICreateUIApiListContextOptions<
+  Typings extends IGenericCrudModuleTypes,
+> = {
+  crudModule: IGenericCrudModule<Typings>;
 };
 
 export const createApiListContextOptions = <
-  T extends ICreateUIApiListContextOptions,
+  Typings extends IGenericCrudModuleTypes,
+  T extends ICreateUIApiListContextOptions<Typings>,
 >(
   options: T
 ) => {
   return options;
 };
 
-export const createUIApiListContext = (
-  options: ICreateUIApiListContextOptions
+export const createUIApiListContext = <Typings extends IGenericCrudModuleTypes>(
+  options: ICreateUIApiListContextOptions<Typings>
 ) => {
   const viewMode = ref(UIApiListViewMode.CARDS);
 
@@ -51,8 +57,8 @@ export const useUIApiListContext = (): UIApiListContext => {
   return apiListContext;
 };
 
-export const setupUIApiListContext = (
-  options: ICreateUIApiListContextOptions
+export const setupUIApiListContext = <Typings extends IGenericCrudModuleTypes>(
+  options: ICreateUIApiListContextOptions<Typings>
 ) => {
   const apiListContext = createUIApiListContext(options);
   provide(STORE_KEY, apiListContext);

diff --git a/sistemas/principal/app/components/UI/API/List/List.vue b/sistemas/principal/app/components/UI/API/List/List.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup generic="T = any">
+<script lang="ts" setup generic="Typings extends IGenericCrudModuleTypes">
 import {
   setupUIApiListContext,
   type ICreateUIApiListContextOptions,
@@ -8,7 +8,7 @@ import type { IGridItemSlotProps } from './Results/Grid/Typings';
 //
 
 type Props = {
-  options: ICreateUIApiListContextOptions<T>;
+  options: ICreateUIApiListContextOptions<Typings>;
 };
 
 const props = defineProps<Props>();
@@ -17,7 +17,9 @@ const props = defineProps<Props>();
 
 type Slots = {
   'options-actions'(props: any): any;
-  'grid-item'(props: IGridItemSlotProps<T>): any;
+
+  'grid-item'(props: IGridItemSlotProps<Typings['List']['ResultItem']>): any;
+
   'grid-item-skeleton'(props: any): any;
 };
 
@@ -39,10 +41,7 @@ setupUIApiListContext(props.options);
 
       <UIAPIListResults>
         <template #grid-item="options">
-          <slot
-            name="grid-item"
-            v-bind="{ ...options, item: options.item as T }"
-          />
+          <slot name="grid-item" v-bind="{ ...options, item: options.item }" />
         </template>
 
         <template #grid-item-skeleton>

diff --git a/sistemas/principal/app/components/UI/API/List/Results/Grid/Grid.vue b/sistemas/principal/app/components/UI/API/List/Results/Grid/Grid.vue
@@ -20,8 +20,8 @@ const {
   isLoading,
   previousItems: items,
 } = await useApiBaseResourceInfinityList<T>(
-  options.baseQueryKey,
-  options.apiBaseResourceListRetriever,
+  options.crudModule.baseQueryKeys,
+  options.crudModule.list,
   formOptions
 );
 

diff --git a/sistemas/principal/app/components/UI/API/List/Results/Results.vue b/sistemas/principal/app/components/UI/API/List/Results/Results.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T = any">
+<script setup lang="ts" generic="Typings extends IGenericCrudModuleTypes">
 import {
   UIApiListViewMode,
   useUIApiListContext,
@@ -8,7 +8,7 @@ import type { IGridItemSlotProps } from './Grid/Typings';
 //
 
 type Slots = {
-  'grid-item'(props: IGridItemSlotProps<T>): any;
+  'grid-item'(props: IGridItemSlotProps<Typings['List']['ResultItem']>): any;
   'grid-item-skeleton'(props: any): any;
 };
 

diff --git a/sistemas/principal/app/components/VV/Autocomplete/API/-Base/index.ts b/sistemas/principal/app/components/VV/Autocomplete/API/-Base/index.ts
@@ -1,27 +1,24 @@
-import type { MaybePromise } from '../../../../../typings';
+import type {
+  IGenericCrudModule,
+  IGenericCrudModuleTypes,
+} from '../../../../../utils';
 
 export type IUIAutocompleteApiRetrieverOptions<
+  Typings extends IGenericCrudModuleTypes,
   Value = any,
-  ResultItemDto = any,
 > = {
-  baseQueryKey: MaybeRef<any>[] | MaybeRef<any>;
+  crudModule: IGenericCrudModule<Typings>;
 
-  apiResourceGetRetriever: (value: Value) => MaybePromise<ResultItemDto | null>;
-  apiResourceListRetriever: IApiBaseResourceListRetriever<ResultItemDto>;
-
-  transformer: (item: ResultItemDto) => { label: string; value: Value };
+  transformer: (item: Typings['GetOne']['Result']) => {
+    label: string;
+    value: Value;
+  };
 };
 
-/**
- * @deprecated
- */
 export const createUIAutocompleteApiRetrieverOptions = <
-  Value = any,
-  ResultItemDto = any,
-  T extends IUIAutocompleteApiRetrieverOptions<
-    Value,
-    ResultItemDto
-  > = IUIAutocompleteApiRetrieverOptions<Value, ResultItemDto>,
+  Typings extends IGenericCrudModuleTypes,
+  Value extends any,
+  T extends IUIAutocompleteApiRetrieverOptions<Typings, Value>,
 >(
   options: T
 ) => options;