resolve v1 > v2 conflicts #131
Merged
Conversation
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
Fix synchronization errors
* v4 datamodel enum implementation * identification component, tabs navigation contactAttempt medium * identification component contactOutcomeConfiguration handling contactAttemptConfiguration handling navigation refactor * prevent full package import with destructuration * remove dead code * ES2020 syntax * syntax update * transmission controls handle identification * extends data managed by identification hook minor graphical/typo fixes * identification questionnaire internal state OK * missing answer * selected tab text color * fix identification component when no data * IASCO transmission control implementation log removal * fix undefined identification evaluation * fix enum entry for API compliance * identification generate valid starting state * typo * label changes * prevent tab switching when saving * fix transmission control * fix panel navigation * save each identification * filter contactOutcome by COconfiguration * UI refactor * fix contact outcome enums by medium * fix enum typo for API compliance * fix selected question highlight prevent valid answers erasure * update identification tab label * sticky tabs bar & prevent overlap on scrolls * extend comment length * new GUI components * fix background color in UE page * GUI improvements : nex compos & CSS * remove previous component * remove unused dictionnary entries * split info in column * update contact data display * update contact component display * fuse individual, phone, mail forms * new components graphical enhancement * GUI AppBar update * contact[attempt/ouctome] GUI update * minor code fix * remove unused imports * update infoTile test : minr GUI change * GUI forms refactor - WIP * user form birthdate change fix * fixes * working phoneNumber * prevent updating fiscal/directory phone numbers * fix missing phone number crash * theme integration for buttons * delete phoneNumbers lateral menu css fix email edition fix birthdate display fix * remove unused import * itw phone number duplicate removal * fix transmission control * GUI fixes * CSS clean-up, dead code removal * rename folder * CSS, fix default contactoutcome * remove unused components * address form refactor * CSS i18n new address data function * infoTile text overflow * fix minor bug * fix tests Co-authored-by: Nicolas Turban <37210319+nicolasTurban@users.noreply.github.com>
* v4 datamodel enum implementation * identification component, tabs navigation contactAttempt medium * identification component contactOutcomeConfiguration handling contactAttemptConfiguration handling navigation refactor * prevent full package import with destructuration * remove dead code * ES2020 syntax * syntax update * transmission controls handle identification * extends data managed by identification hook minor graphical/typo fixes * identification questionnaire internal state OK * missing answer * selected tab text color * fix identification component when no data * IASCO transmission control implementation log removal * fix undefined identification evaluation * fix enum entry for API compliance * identification generate valid starting state * typo * label changes * prevent tab switching when saving * fix transmission control * fix panel navigation * save each identification * filter contactOutcome by COconfiguration * UI refactor * fix contact outcome enums by medium * fix enum typo for API compliance * fix selected question highlight prevent valid answers erasure * update identification tab label * sticky tabs bar & prevent overlap on scrolls * extend comment length * new GUI components * fix background color in UE page * GUI improvements : nex compos & CSS * remove previous component * remove unused dictionnary entries * split info in column * update contact data display * update contact component display * fuse individual, phone, mail forms * new components graphical enhancement * GUI AppBar update * contact[attempt/ouctome] GUI update * minor code fix * remove unused imports * update infoTile test : minr GUI change * GUI forms refactor - WIP * user form birthdate change fix * fixes * working phoneNumber * prevent updating fiscal/directory phone numbers * fix missing phone number crash * theme integration for buttons * delete phoneNumbers lateral menu css fix email edition fix birthdate display fix * remove unused import * itw phone number duplicate removal * fix transmission control * GUI fixes * CSS clean-up, dead code removal * rename folder * CSS, fix default contactoutcome * remove unused components * address form refactor * CSS i18n new address data function * infoTile text overflow * fix minor bug * fix tests * Migration vite & DramaQueen integration (#109) * change extension js -> jsx * remove jsx extension in custom hook * vite migration :warning: The build path is now dist * Update package.json * let output dir as build * remove react script * migration jest to vitest * revert changes in ci and script related to dist path * make service worker works * drama queen integration * make build esnext * endpoint service worker * disable queen healthcheck when synchronize * remove code smell in vite.config.js * remove k8s files * bump version 1.0.0 * Service worker update, retro compatibility with prod (#111) * update sw * retro compatibility with service worker we must be retrocompatible with service worker already loaded in user navigator so the update works * bump version to 1.0.1 * fix: upgrade workbox version for FF compliance --------- Co-authored-by: Nicolas Turban <37210319+nicolasTurban@users.noreply.github.com> Co-authored-by: Dylan Decrulle <dylan.decrulle@outlook.fr>
SimonDmz
force-pushed
the
chore-resolve-master-conflicts
branch
from
7f6a3e6 to
7fb45aa
Compare
|
SimonDmz
added a commit
that referenced
this pull request
Apr 11, 2024
* v4 datamodel enum implementation * identification component, tabs navigation contactAttempt medium * identification component contactOutcomeConfiguration handling contactAttemptConfiguration handling navigation refactor * prevent full package import with destructuration * remove dead code * ES2020 syntax * syntax update * transmission controls handle identification * extends data managed by identification hook minor graphical/typo fixes * identification questionnaire internal state OK * missing answer * selected tab text color * fix identification component when no data * IASCO transmission control implementation log removal * fix undefined identification evaluation * fix enum entry for API compliance * identification generate valid starting state * typo * label changes * prevent tab switching when saving * fix transmission control * fix panel navigation * save each identification * filter contactOutcome by COconfiguration * UI refactor * fix contact outcome enums by medium * fix enum typo for API compliance * fix selected question highlight prevent valid answers erasure * update identification tab label * sticky tabs bar & prevent overlap on scrolls * extend comment length * new GUI components * fix background color in UE page * GUI improvements : nex compos & CSS * remove previous component * remove unused dictionnary entries * split info in column * update contact data display * update contact component display * fuse individual, phone, mail forms * new components graphical enhancement * GUI AppBar update * contact[attempt/ouctome] GUI update * minor code fix * remove unused imports * update infoTile test : minr GUI change * GUI forms refactor - WIP * user form birthdate change fix * fixes * working phoneNumber * prevent updating fiscal/directory phone numbers * fix missing phone number crash * theme integration for buttons * delete phoneNumbers lateral menu css fix email edition fix birthdate display fix * remove unused import * itw phone number duplicate removal * fix transmission control * GUI fixes * CSS clean-up, dead code removal * rename folder * CSS, fix default contactoutcome * remove unused components * address form refactor * CSS i18n new address data function * infoTile text overflow * fix minor bug * fix tests * Migration vite & DramaQueen integration (#109) * change extension js -> jsx * remove jsx extension in custom hook * vite migration :warning: The build path is now dist * Update package.json * let output dir as build * remove react script * migration jest to vitest * revert changes in ci and script related to dist path * make service worker works * drama queen integration * make build esnext * endpoint service worker * disable queen healthcheck when synchronize * remove code smell in vite.config.js * remove k8s files * bump version 1.0.0 * Service worker update, retro compatibility with prod (#111) * update sw * retro compatibility with service worker we must be retrocompatible with service worker already loaded in user navigator so the update works * bump version to 1.0.1 * feat : communication request feature first version feat : User information POC fix : prevent component definition during render fix : missing key attributes in collections render tests : communicationFunction first tests fix: vite compliance fix: iDB schema extension instead for replacement fix: civilityEnum instead of hard-coded string * feat: better readability of comment * fix: version upg * fix: comm_request INIT -> INTIATED API compliance * fix: comment comp alway show 6 lines * feat: prevent sending communication * feat: check address validity before sending comm * feat: no comm sent if incomplete sender/recipient * fix: restore deleted css * feat: User profile icon + pop-up test: update tests 🎨 : fix misformatted code * fix: handle comp unmounting and strict mode * fix: wrong attribute name (#117) * fix: wrong attribute name * version bump * Fix : less strict controls, refactor * fix: use safe function to get privileged person * ci: upgrade build and add docker step in develop (#121) * cii: upgrade build and add docker step in develop * Update package.json * ci: add context docker step * Update package.json * ci: add -rc images * DRAFT : Redesign & maintenance (#124) * feat: refactor layout and material UI * ref: router 6 migration * fix: legacy panels * ref: filter rework * feat: finish filter Home * ref: redesign survey unit card * fix: status chip * fix(home): scrollbar offset * add new color for lockIcon * use local Typhography and change style * add placeholder * feat(ui): Row component * add fontWeight to statusChip * add inactiveStyle & inaccessible * add inactive & locked * add priority on card * ref(ui): add disabled variant for Card * terminated switch * feat(ui): notifications * fix: filter terminated * remove color * add finalize enum * change accordion sidebar * add finalize enum * remove console.log palette * feat: suivi circular progress * feat: notifications actions * feat(ui): Pie chart for suivi page * ref: CampaignProgressPieChart * ref: search and types * feat: SyncDialog update * feat: suivi table * fix: comment modal * fix: text layout on suivi table * fix: button layout on sync result * feat(ui): Survey Unit page header * feat(ui): Survey Unit Address Card * feat: survey unit logement & repérage * feat: survey unit persons form & card * fix: comment on add button * fix: Contacts card * fix: add form for comment dialog * feat: ContactOutcomeForm * feat: Contact attempt form * feat: seeder for development * feat: Communications form * feat: Comment form * ref: Snackbar * fix: snackbar showing too much * chore: cleaning * chore: cleaning tests & dependencies * feat: not found page * Add new component QuestionnaireCard * add icons * create customChip * HousingResident component * personlist Component * QuestionnaireCard component * to fix gitlab ci * remove rollupOptions * feat: reset data page * add help button & popover * add old Questionnaire component * fix surveyUnitHeader * fix homepage * fix tableau de synthése * maj mui * comment grappe select * fix PieChart size * add textfield searchByName * feat: identification for phone surveyUnit * feat: form for move property * change paddingBlock for pieChart * change filter input * activate select grappe * desactivate grappe * fix: noident identification text * active grappe select * feat: persist filter state * fix: label for identification * fix pieChart label * fix : no nograp doesn't crash Select anymore, bonus fix for ssech * feat: packaged randomness * chore: refactor code for readibility * fix: remove Chat references, not used anymore * fix: another chat reference * fix: add missing radio-group `name` attribute * feat: change some labels * add persist campagn monsuivi * oidc * fix: typo * feat: prevent workbox upgrade -> keep v6.6.1 * fix: restore previious authentication * feat: fallback-configuration * Chore service worker tests (#128) * chore: test workbox 6 * feat: bump app version for test * fix: use theme from provider, clean theme build, i18n * feat: restore state life-cycle * fix: typo * feat: transmission steps are checked instead of disapear * fix: work-box dependecies version * test: clg in sw registration * chore: more log in SW installation * chore: even more log * fix: missing import * Update ServiceWorkerStatus.jsx * fix: restore Queen SW * bumb: worbox version * feat: i18n --------- Co-authored-by: Laurent Caouissin <caouissin.laurent@gmail.com> * Fix suppress location (#129) * fix: remove category dont know * fix: conditional rendering for noLocation * add noLocation to dictionnary * fix: remove clg * fix: add dynamic data for grappe * fix: move addressDeliveryPoint to be correct with AddressCard * feat: add reset to campaign select filter * fix: handle tricky bug on phoneNumbers being switched between persons (#130) * add case to switch lang depends on browser for datepicker * fix: remove useless Fragment * add medium message to contact * add new condition & remove ternary * correction orthographique status * chore: remove unused files * resolve v1 > v2 conflicts (#131) * Develop (#101) * v4 datamodel enum implementation * identification component, tabs navigation contactAttempt medium * identification component contactOutcomeConfiguration handling contactAttemptConfiguration handling navigation refactor * prevent full package import with destructuration * remove dead code * ES2020 syntax * syntax update * transmission controls handle identification * extends data managed by identification hook minor graphical/typo fixes * identification questionnaire internal state OK * missing answer * selected tab text color * fix identification component when no data * IASCO transmission control implementation log removal * fix undefined identification evaluation * fix enum entry for API compliance * identification generate valid starting state * typo * label changes * prevent tab switching when saving * fix transmission control * fix panel navigation * save each identification * filter contactOutcome by COconfiguration * UI refactor * fix contact outcome enums by medium * fix enum typo for API compliance * fix selected question highlight prevent valid answers erasure * update identification tab label * sticky tabs bar & prevent overlap on scrolls * extend comment length * new GUI components * fix background color in UE page * GUI improvements : nex compos & CSS * remove previous component * remove unused dictionnary entries * split info in column * update contact data display * update contact component display * fuse individual, phone, mail forms * new components graphical enhancement * GUI AppBar update * contact[attempt/ouctome] GUI update * minor code fix * remove unused imports * update infoTile test : minr GUI change * GUI forms refactor - WIP * user form birthdate change fix * fixes * working phoneNumber * prevent updating fiscal/directory phone numbers * fix missing phone number crash * theme integration for buttons * delete phoneNumbers lateral menu css fix email edition fix birthdate display fix * remove unused import * itw phone number duplicate removal * fix transmission control * GUI fixes * CSS clean-up, dead code removal * rename folder * CSS, fix default contactoutcome * remove unused components * address form refactor * CSS i18n new address data function * infoTile text overflow * fix minor bug * fix tests Co-authored-by: Nicolas Turban <37210319+nicolasTurban@users.noreply.github.com> * Fix/ff offline service worker (#122) * v4 datamodel enum implementation * identification component, tabs navigation contactAttempt medium * identification component contactOutcomeConfiguration handling contactAttemptConfiguration handling navigation refactor * prevent full package import with destructuration * remove dead code * ES2020 syntax * syntax update * transmission controls handle identification * extends data managed by identification hook minor graphical/typo fixes * identification questionnaire internal state OK * missing answer * selected tab text color * fix identification component when no data * IASCO transmission control implementation log removal * fix undefined identification evaluation * fix enum entry for API compliance * identification generate valid starting state * typo * label changes * prevent tab switching when saving * fix transmission control * fix panel navigation * save each identification * filter contactOutcome by COconfiguration * UI refactor * fix contact outcome enums by medium * fix enum typo for API compliance * fix selected question highlight prevent valid answers erasure * update identification tab label * sticky tabs bar & prevent overlap on scrolls * extend comment length * new GUI components * fix background color in UE page * GUI improvements : nex compos & CSS * remove previous component * remove unused dictionnary entries * split info in column * update contact data display * update contact component display * fuse individual, phone, mail forms * new components graphical enhancement * GUI AppBar update * contact[attempt/ouctome] GUI update * minor code fix * remove unused imports * update infoTile test : minr GUI change * GUI forms refactor - WIP * user form birthdate change fix * fixes * working phoneNumber * prevent updating fiscal/directory phone numbers * fix missing phone number crash * theme integration for buttons * delete phoneNumbers lateral menu css fix email edition fix birthdate display fix * remove unused import * itw phone number duplicate removal * fix transmission control * GUI fixes * CSS clean-up, dead code removal * rename folder * CSS, fix default contactoutcome * remove unused components * address form refactor * CSS i18n new address data function * infoTile text overflow * fix minor bug * fix tests * Migration vite & DramaQueen integration (#109) * change extension js -> jsx * remove jsx extension in custom hook * vite migration * let output dir as build * remove react script * migration jest to vitest * drama queen integration * endpoint service worker * disable queen healthcheck when synchronize * remove k8s files * bump version 1.0.0 * Service worker update, retro compatibility with prod (#111) * update sw * retro compatibility with service worker we must be retrocompatible with service worker already loaded in user navigator so the update works * bump version to 1.0.1 * fix: upgrade workbox version for FF compliance --------- Co-authored-by: Nicolas Turban <37210319+nicolasTurban@users.noreply.github.com> Co-authored-by: Dylan Decrulle <dylan.decrulle@outlook.fr> * resolve v1 > v2 conflicts --------- Co-authored-by: Nicolas Turban <37210319+nicolasTurban@users.noreply.github.com> Co-authored-by: Dylan Decrulle <dylan.decrulle@outlook.fr> * chore : bump version --------- Co-authored-by: Simon Demazière <simon.demaziere@insee.fr> Co-authored-by: Nicolas Turban <37210319+nicolasTurban@users.noreply.github.com> Co-authored-by: Eric Thuaud <58465319+EricThuaud@users.noreply.github.com> Co-authored-by: Jonathan <395137+Grafikart@users.noreply.github.com>
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.
No description provided.