-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(bo): list territoires filter and dsfrV2 760
- Loading branch information
Showing
11 changed files
with
361 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,20 @@ | ||
| const Territoire = require("../../services/Territoire"); | ||
|
|
||
| const logger = require("../../utils/logger"); | ||
|
|
||
| const log = logger(module.filename); | ||
|
|
||
| module.exports = async function list(_req, res) { | ||
| module.exports = async function list(req, res, next) { | ||
| log.i("IN"); | ||
| const territoires = await Territoire.fetch(); | ||
| log.i("DONE"); | ||
| return res.json({ territoires }); | ||
| try { | ||
| const territoires = await Territoire.fetch(req.query); | ||
| log.d(territoires); | ||
| return res.status(200).json({ | ||
| territoires: territoires.rows, | ||
| total: territoires.total, | ||
| }); | ||
| } catch (error) { | ||
| log.w(error); | ||
| log.w("DONE with error"); | ||
| return next(error); | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
181 changes: 181 additions & 0 deletions
181
packages/frontend-bo/src/components/territoires/DefaultTable.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| <template> | ||
| <TerritoiresDefaultTableFilters | ||
| v-model:text="text" | ||
| @filters-update="updateData" | ||
| /> | ||
| <DsfrDataTableV2Wrapper | ||
| v-model:limit="limit" | ||
| v-model:offset="offset" | ||
| v-model:sort="sort" | ||
| v-model:sort-direction="sortDirection" | ||
| :titles="titles" | ||
| :table-title="title" | ||
| :data="data" | ||
| :total="total" | ||
| row-id="territoireId" | ||
| is-sortable | ||
| @update-data="updateData" | ||
| > | ||
| <template #cell:typeTerritoire="{ row }"> | ||
| {{ row.type === "DEP" ? "Département" : "Région" }} | ||
| </template> | ||
| <template #cell:custom-edit="{ row }"> | ||
| <DsfrButton | ||
| :label=" | ||
| ['FRA', row.value, row.parent].includes(userStore.user.territoireCode) | ||
| ? 'Editer la fiche territoire' | ||
| : 'Consulter la fiche territoire' | ||
| " | ||
| :icon=" | ||
| ['FRA', row.value, row.parent].includes(userStore.user.territoireCode) | ||
| ? 'fr-icon-edit-fill' | ||
| : 'fr-icon-eye-fill' | ||
| " | ||
| icon-only | ||
| primary | ||
| size="small" | ||
| type="button" | ||
| @click="navigate(row)" | ||
| /> | ||
| </template> | ||
| </DsfrDataTableV2Wrapper> | ||
| </template> | ||
|
|
||
| <script setup> | ||
| import { DsfrDataTableV2Wrapper } from "@vao/shared"; | ||
| const territoireStore = useTerritoireStore(); | ||
| const userStore = useUserStore(); | ||
| const route = useRoute(); | ||
| const data = computed(() => territoireStore.territoires); | ||
| const total = computed(() => territoireStore.total); | ||
| const { query } = route; | ||
| const titles = [ | ||
| { | ||
| key: "text", | ||
| label: "Libellé", | ||
| options: { | ||
| isSortable: true, | ||
| }, | ||
| }, | ||
| { | ||
| key: "typeTerritoire", | ||
| label: "Département/Région", | ||
| options: { | ||
| isSortable: false, | ||
| }, | ||
| }, | ||
| { | ||
| key: "nbUsersBO", | ||
| label: "Contacts", | ||
| sort: false, | ||
| }, | ||
| { | ||
| key: "value", | ||
| label: "Code", | ||
| options: { | ||
| isSortable: true, | ||
| }, | ||
| }, | ||
| { | ||
| key: "correspVaoNom", | ||
| label: "Référent VAO", | ||
| options: { | ||
| isSortable: true, | ||
| }, | ||
| }, | ||
| { | ||
| key: "serviceTelephone", | ||
| label: "Téléphone", | ||
| options: { | ||
| isSortable: true, | ||
| }, | ||
| }, | ||
| { | ||
| key: "serviceMail", | ||
| label: "Boite fonctionnelle", | ||
| options: { | ||
| isSortable: true, | ||
| }, | ||
| }, | ||
| { | ||
| key: "custom-edit", | ||
| label: "Action", | ||
| }, | ||
| ]; | ||
| const title = computed( | ||
| () => `Liste des territoires (${territoireStore.total})`, | ||
| ); | ||
| const sortableTitles = titles.flatMap((title) => | ||
| title.options?.isSortable ? [title.key] : [], | ||
| ); | ||
| const text = ref(query.text ?? ""); | ||
| const limit = ref(parseInt(query.limit, 10) || 10); | ||
| const offset = ref(parseInt(query.offset, 10) || 0); | ||
| const sort = ref(sortableTitles.includes(query.sort) ? query.sort : ""); | ||
| const sortDirection = ref( | ||
| ["", "ASC", "DESC"].includes(query.sortDirection) ? query.sortDirection : "", | ||
| ); | ||
| const isValidParams = (params) => | ||
| params !== undefined && | ||
| params !== null && | ||
| params !== "" && | ||
| (!Array.isArray(params) || params.length > 0); | ||
| const getSearchParams = () => | ||
| isValidParams(text.value) ? { text: text.value } : {}; | ||
| let timeout = null; | ||
| const updateData = () => { | ||
| if (timeout) { | ||
| clearTimeout(timeout); | ||
| } | ||
| timeout = setTimeout(() => { | ||
| const query = { | ||
| limit: limit.value, | ||
| offset: offset.value, | ||
| ...(isValidParams(sort.value) ? { sortBy: sort.value } : {}), | ||
| ...(isValidParams(sortDirection.value) | ||
| ? { sortDirection: sortDirection.value.toUpperCase() } | ||
| : {}), | ||
| ...getSearchParams(), | ||
| }; | ||
| territoireStore.fetch2(query); | ||
| navigateTo({ | ||
| query: { | ||
| limit: limit.value, | ||
| offset: offset.value, | ||
| ...(isValidParams(sort.value) ? { sortBy: sort.value } : {}), | ||
| ...(isValidParams(sortDirection.value) | ||
| ? { sortDirection: sortDirection.value } | ||
| : {}), | ||
| ...getSearchParams(), | ||
| }, | ||
| }); | ||
| }, 300); | ||
| }; | ||
| onUnmounted(() => { | ||
| if (timeout) { | ||
| clearTimeout(timeout); | ||
| } | ||
| }); | ||
| updateData(); | ||
| // actions | ||
| const navigate = (state) => { | ||
| navigateTo({ | ||
| path: `/territoires/${state.territoireId}`, | ||
| }); | ||
| }; | ||
| </script> |
Oops, something went wrong.