diff --git a/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts b/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts index 5398c5ae7200d92042cf4de71d5f6011cc88e48a..bc6e1bce17982e95378366ec9a34e530a4bbd378 100644 --- a/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts +++ b/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts @@ -496,3 +496,11 @@ export const getDocuments = (titreTypeId?: TitreTypeId, demarcheId?: DemarcheTyp throw new Error(`il manque des éléments pour trouver les documents titreTypeId: '${titreTypeId}', demarcheId: ${demarcheId}, etapeTypeId: ${etapeTypeId}`) } } + +export const etapesTypesDocumentsTypesMetas = Object.keys(EtapesTypesDocumentsTypes).flatMap(etapeTypeId => { + return EtapesTypesDocumentsTypes[etapeTypeId as keyof typeof EtapesTypesDocumentsTypes].map(({ documentTypeId, optionnel }) => ({ + etapeTypeId, + documentTypeId, + optionnel, + })) +}) diff --git a/packages/ui/src/api/fragments/metas.js b/packages/ui/src/api/fragments/metas.js deleted file mode 100644 index 84f1d3df99e6114a21f44c90bbf23a3bc96a8865..0000000000000000000000000000000000000000 --- a/packages/ui/src/api/fragments/metas.js +++ /dev/null @@ -1,21 +0,0 @@ -import gql from 'graphql-tag' - -const fragmentDocumentType = gql` - fragment documentType on DocumentType { - id - nom - optionnel - description - } -` - -const fragmentEtapeTypeDocumentType = gql` - fragment etapeTypeDocumentType on EtapeTypeDocumentType { - etapeTypeId - documentTypeId - optionnel - description - } -` - -export { fragmentDocumentType, fragmentEtapeTypeDocumentType } diff --git a/packages/ui/src/api/metas.js b/packages/ui/src/api/metas.js deleted file mode 100644 index d4463d108cdbf140bd108d7b6ad24a4471d75b9f..0000000000000000000000000000000000000000 --- a/packages/ui/src/api/metas.js +++ /dev/null @@ -1,25 +0,0 @@ -import gql from 'graphql-tag' -import { apiGraphQLFetch } from './_client' -import { fragmentDocumentType, fragmentEtapeTypeDocumentType } from './fragments/metas' - -const documentsTypes = apiGraphQLFetch(gql` - query DocumentsTypes { - documentsTypes { - ...documentType - } - } - - ${fragmentDocumentType} -`) - -const etapesTypesDocumentsTypes = apiGraphQLFetch(gql` - query EtapesTypesDocumentsTypes { - etapesTypesDocumentsTypes { - ...etapeTypeDocumentType - } - } - - ${fragmentEtapeTypeDocumentType} -`) - -export { documentsTypes, etapesTypesDocumentsTypes } diff --git a/packages/ui/src/components/meta.tsx b/packages/ui/src/components/meta.tsx index ad214792ca20307ddd30d4354576d826dcceeff9..d965b0b557ab71e22f3b4ef72d792b381d715d2e 100644 --- a/packages/ui/src/components/meta.tsx +++ b/packages/ui/src/components/meta.tsx @@ -112,7 +112,7 @@ export const Meta = defineComponent(() => { <> {definition.value.colonnes.map(colonne => ( <td key={colonne.id}> - <div>{element[colonne.id]}</div> + <div>{JSON.stringify(element[colonne.id])}</div> </td> ))} </> diff --git a/packages/ui/src/metas-definitions.ts b/packages/ui/src/metas-definitions.ts index 84bf0016a152a986c70c1a79033919e916286550..422f740cbaed29111806b16ca811320e3de932a7 100644 --- a/packages/ui/src/metas-definitions.ts +++ b/packages/ui/src/metas-definitions.ts @@ -1,5 +1,3 @@ -import { documentsTypes, etapesTypesDocumentsTypes } from '@/api/metas' - import { FREQUENCES_IDS } from 'camino-common/src/static/frequence' import { Domaines } from 'camino-common/src/static/domaines' import { TitresTypesTypes } from 'camino-common/src/static/titresTypesTypes' @@ -11,12 +9,13 @@ import { sortedDemarchesTypes } from 'camino-common/src/static/demarchesTypes' import { titresTypesDemarcheTypesMetas } from 'camino-common/src/static/titresTypesDemarchesTypes' import { etapesTypesEntrepriseDocumentsTypesMetas, TDEEntrepriseDocumentsTypesMetas } from 'camino-common/src/static/titresTypes_demarchesTypes_etapesTypes/entrepriseDocuments' import { TDEMetas } from 'camino-common/src/static/titresTypes_demarchesTypes_etapesTypes' -import { TDEDocumentsTypesMetas } from 'camino-common/src/static/titresTypes_demarchesTypes_etapesTypes/documents' +import { etapesTypesDocumentsTypesMetas, TDEDocumentsTypesMetas } from 'camino-common/src/static/titresTypes_demarchesTypes_etapesTypes/documents' import { EtapesStatuts } from 'camino-common/src/static/etapesStatuts' import { etapesTypesEtapesStatutsMetas } from 'camino-common/src/static/etapesTypesEtapesStatuts' import { TitresTypes } from 'camino-common/src/static/titresTypes' import { sortedActivitesTypes } from 'camino-common/src/static/activitesTypes' import { EtapesTypes } from 'camino-common/src/static/etapesTypes' +import { sortedDocumentTypes } from 'camino-common/src/static/documentsTypes' const labelGet = (entity?: { id: string; nom: string }) => (entity ? `${entity.id} - ${entity.nom}` : '') @@ -297,7 +296,7 @@ export const metasIndex = { ids: ['titreTypeId', 'demarcheTypeId', 'etapeTypeId', 'documentTypeId'], }, 'etapes-types--documents-types': { - get: etapesTypesDocumentsTypes, + get: () => etapesTypesDocumentsTypesMetas, nom: 'Types des étapes | Types des documents', colonnes: [ { @@ -312,8 +311,7 @@ export const metasIndex = { type: 'entities', entities: 'documents-types', }, - { id: 'optionnel', nom: 'Optionnel', type: Boolean, optional: true }, - { id: 'description', nom: 'Description', type: String, optional: true }, + { id: 'optionnel', nom: 'Optionnel', type: Boolean }, ], ids: ['etapeTypeId', 'documentTypeId'], }, @@ -338,7 +336,7 @@ export const metasIndex = { ids: ['etapeTypeId', 'documentTypeId'], }, 'documents-types': { - get: documentsTypes, + get: () => sortedDocumentTypes, labelGet, nom: 'Types des documents', colonnes: [