Release : Filtre entreprise dans le catalogue + dans le détail des projets #1832
Conversation
This file contains hidden or 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
…umbers of programs updated
…/company-data-filter-improvements
…ct-the-ohter-way' into release/company-data-filter-improvements
…filter-improvements
# Conflicts: # apps/nuxt/src/components/filters/FiltersAccordion.vue # apps/nuxt/src/components/project/details/ProjectPrograms.vue # apps/nuxt/src/components/project/details/ProjectSideNav.vue # apps/nuxt/src/tools/companyData/companyData.ts
# Conflicts: # apps/nuxt/src/components/catalog/CatalogLayout.vue
3 tasks
There was a problem hiding this comment.
Copilot reviewed 25 out of 26 changed files in this pull request and generated no comments.
Files not reviewed (1)
- apps/nuxt/src/assets/scss/sidemenu.scss: Language not supported
Comments suppressed due to low confidence (7)
apps/nuxt/src/stores/program.ts:35
- Verify that ProgramFilter.byCompanyData accepts a boolean value as its second argument, as this replaces the previously passed company data. Adjust the filter logic if the function expects a different type.
ProgramFilter.byCompanyData(program, isCompanySelected)
apps/nuxt/src/pages/projets-entreprise/[projectSlug]/index.vue:12
- Ensure the removal of MiddlewareName.resetFilters is intentional, as this change may affect the expected reset behavior on project detail pages.
middleware: [MiddlewareName.resetUsedTrackStore, MiddlewareName.resetQueries, MiddlewareName.hasProject]
apps/nuxt/src/pages/aides-entreprise/index.vue:42
- Confirm that switching the argument to true in getDependentCompanyData is the intended behavior for fetching enterprise aid data.
await new ProgramManager().getDependentCompanyData(true)
apps/nuxt/src/components/filters/FilterByCompanyData.vue:94
- [nitpick] Using a computed setter that instantiates Navigation on every set call could lead to performance issues; consider reusing a Navigation instance or refactoring the logic to reduce redundant instantiations.
const isCompanyDataSelected = computed({
apps/nuxt/src/components/catalog/CatalogProjects.vue:1
- Ensure that the deletion of CatalogProjects.vue is intentional and that all references to this component have been updated.
File removed entirely
apps/nuxt/src/components/catalog/CatalogPrograms.vue:1
- Verify that the removal of CatalogPrograms.vue does not break any dependent functionality in the catalog flow.
File removed entirely
apps/nuxt/src/components/catalog/CatalogLayout.vue:1
- Confirm that removing CatalogLayout.vue is intentional and that any components relying on its structure have been refactored accordingly.
File removed entirely
1 task
|
Salut, je viens de débuter ma review. Si jamais tu es en train de regarder cette PR, il y a un petit problème fonctionnel sur :
|
ttdm
approved these changes
Apr 16, 2025
Comment on lines
+94
to
+105
| const isCompanyDataSelected = computed({ | ||
| get: () => useFiltersStore().getCompanyDataSelected().value, | ||
| set: (value: boolean) => { | ||
| useFiltersStore().companyDataSelected = value | ||
| if (navigation.isCatalogProjects()) { | ||
| new ProjectManager().getProjects() | ||
| } | ||
| if (navigation.isCatalogProjectDetail() || navigation.isCatalogPrograms()) { | ||
| new ProgramManager().getDependentCompanyData(true) | ||
| } | ||
| } | ||
| }) |
| @@ -3,7 +3,7 @@ | |||
| v-if="isDataFull || countFilteredPrograms" | |||
| id="project-aids-title" | |||
| class="fr-pt-3v fr-pb-4v fr-border-b--grey--light" | |||
| title="💰 Mes aides" | |||
| :title="isCompanyDataSelected ? '💰 Vos aides' : '💰 Toutes les aides'" | |||
There was a problem hiding this comment.
voir même companyDataSelected && isDataFull
| const teeProjectFormContainer = useTemplateRef<HTMLElement>('teeProjectFormContainer') | ||
|
|
||
| const resume = computed<string>(() => | ||
| Translation.t('project.programsList', { | ||
| effectif: Translation.t('enterprise.structureSize.' + CompanyData.size), |
There was a problem hiding this comment.
Remarque: c'est peut être le moment de changer les valeur qui s'affichent en fonction de la taille des entreprises.
JB s'est pris des remarques en comité opérateur à cause du MICRO quand les entreprises font moins de 10personnes.
| @@ -40,6 +40,7 @@ export const useFiltersStore = defineStore('filters', () => { | |||
| [FilterItemKeys.regionAid]: [], | |||
| [FilterItemKeys.operatorAid]: [] | |||
| } | |||
| setCompanyDataSelected(true) | |||
There was a problem hiding this comment.
ça me semble étonnant ça.
ça t'airait de le mettre derrière un "ifCompanyDataFull" ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.