Skip to content

Commit

Permalink
Develop (#118)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Dylan Decrulle <[email protected]>

* resolve v1 > v2 conflicts

---------

Co-authored-by: Nicolas Turban <[email protected]>
Co-authored-by: Dylan Decrulle <[email protected]>

* chore : bump version

---------

Co-authored-by: Simon Demazière <[email protected]>
Co-authored-by: Nicolas Turban <[email protected]>
Co-authored-by: Eric Thuaud <[email protected]>
Co-authored-by: Jonathan <[email protected]>
  • Loading branch information
5 people committed Apr 11, 2024
1 parent 217044d commit ea48f7e
Show file tree
Hide file tree
Showing 239 changed files with 11,136 additions and 9,223 deletions.
5 changes: 2 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
QUEEN_URL=https://queen.demo.dev.sspcloud.fr
PEARL_API_URL=https://pearl-bo.demo.dev.sspcloud.fr
QUEEN_URL=https://drama-queen.demo.insee.io
PEARL_API_URL=https://pearl-bo.demo.insee.io
PEARL_AUTHENTICATION_MODE=anonymous
CHAT_URL=
16 changes: 5 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,18 @@ jobs:
install:
runs-on: ubuntu-latest
steps:
- name: Use Node.js 14C
uses: actions/setup-node@v1
with:
node-version: 14
- uses: actions/setup-node@v3
- run: yarn --frozen-lockfile
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: 14
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- run: yarn
- run: yarn build
- run: yarn test
- run: yarn build
- name: Upload build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build
path: build
80 changes: 55 additions & 25 deletions .github/workflows/develop-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,66 @@ on:
push:
branches:
- 'develop'
tags:
- '*'

jobs:
install:
runs-on: ubuntu-latest
steps:
- name: Use Node.js 14C
uses: actions/setup-node@v1
with:
node-version: 14
- run: yarn --frozen-lockfile
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: 14
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- run: yarn
- run: yarn build
- name: Upload build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build
name: pearl-jam
path: build

check_if_version_upgraded:
needs: build
runs-on: ubuntu-latest
outputs:
is_upgraded_version: ${{ steps.check.outputs.changed }}
version: ${{ steps.check.outputs.version }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- name: Check if version has been updated
id: check
uses: EndBug/version-check@v2

docker:
needs: check_if_version_upgraded
if: needs.check_if_version_upgraded.outputs.is_upgraded_version == 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: actions/download-artifact@v3
with:
name: pearl-jam
path: build
- uses: docker/build-push-action@v4
with:
platforms: linux/amd64,linux/arm64
push: true
context: .
tags: |
inseefr/pearl-jam:latest,
inseefr/pearl-jam:${{ needs.check_if_version_upgraded.outputs.version }}-rc
release:
needs: check_if_version_upgraded
if: needs.check_if_version_upgraded.outputs.is_upgraded_version == 'true'
runs-on: ubuntu-latest
steps:
- name: Checkout current branch
uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
- name: Get current version
id: version
uses: notiz-dev/github-action-json-property@release
Expand All @@ -45,11 +73,13 @@ jobs:
- run: echo ${{steps.version.outputs.prop}}
- name: Release snapshot
id: release-snapshot
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: softprops/action-gh-release@v1
with:
tag_name: ${{steps.version.outputs.prop}}-rc
release_name: Release Candidate ${{steps.version.outputs.prop}}
name: Release Candidate ${{ needs.check_if_version_upgraded.outputs.version }}
tag_name: ${{ needs.check_if_version_upgraded.outputs.version }}-rc
target_commitish: ${{ github.head_ref || github.ref }}
generate_release_notes: true
draft: false
prerelease: false
prerelease: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
branches:
- 'master'
tags:
- '*'

jobs:
install:
Expand Down
5 changes: 1 addition & 4 deletions configuration/configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,5 @@
"_PEARL_API_URL_COMMENT_": "url of Pearl API",

"PEARL_AUTHENTICATION_MODE": "${PEARL_AUTHENTICATION_MODE}",
"_PEARL_AUTHENTICATION_MODE_COMMENT": "The mode of authentication. Currently, App is supporting 'anonymous'",

"CHAT_URL": "${CHAT_URL}",
"_CHAT_URL_COMMENT_": "url of Pearl Chat"
"_PEARL_AUTHENTICATION_MODE_COMMENT": "The mode of authentication. Currently, App is supporting 'anonymous'"
}
39 changes: 19 additions & 20 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="/static/images/logo-insee-header.png" />
<!--
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="/static/images/logo-insee-header.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="/manifest.json" />

<script type="text/javascript"
src="https://unpkg.com/@webcomponents/[email protected]/webcomponents-bundle.js"></script>
<title>Collecte Enquêteurs</title>
</head>
<link rel="manifest" href="/manifest.json" />

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="./src/index.jsx"></script>
</body>
<title>Collecte Enquêteurs</title>
</head>

</html>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="./src/index.jsx"></script>
</body>
</html>
59 changes: 24 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,28 @@
{
"name": "pearl",
"version": "1.0.2",
"version": "2.0.3",
"private": true,
"dependencies": {
"@date-io/date-fns": "1.x",
"@material-ui/core": "^4.11.2",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.57",
"@material-ui/pickers": "^3.3.10",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.5",
"@testing-library/user-event": "^11.2.5",
"clsx": "^1.1.1",
"date-fns": "^2.18.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/montserrat": "^5.0.16",
"@maverick-js/signals": "^5.11.4",
"@mui/icons-material": "^5.15.10",
"@mui/material": "^5.15.10",
"@mui/styles": "^5.15.10",
"@mui/x-date-pickers": "^6.18.6",
"date-fns": "^2.30.0",
"dexie": "^3.2.1",
"dexie-export-import": "^1.0.3",
"dexie-react-hooks": "^1.1.1",
"downloadjs": "^1.4.7",
"font-awesome": "^4.7.0",
"keycloak-js": "^10.0.2",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-modal": "^3.11.1",
"react-router-dom": "^5.2.0",
"postcss": "8.4.24",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.49.2",
"react-router-dom": "^6.21.0",
"react-swipeable-views": "^0.14.0",
"workbox-cacheable-response": "^7.0.0",
"workbox-core": "^7.0.0",
"workbox-precaching": "^7.0.0",
"workbox-routing": "^7.0.0",
"workbox-strategies": "^7.0.0"
"zod": "^3.22.4"
},
"scripts": {
"dev": "vite",
Expand All @@ -52,9 +45,6 @@
"jsx-a11y"
],
"rules": {
"react/prop-types": [
"off"
],
"prettier/prettier": [
1,
{
Expand Down Expand Up @@ -99,12 +89,9 @@
},
"devDependencies": {
"@originjs/vite-plugin-federation": "^1.2.1",
"@types/react": "^16.9.23",
"@types/react-router-dom": "^5.1.3",
"@vitejs/plugin-react": "^3.1.0",
"@types/react": "^18.2.46",
"@vitejs/plugin-react": "^4.2.1",
"copy-and-watch": "^0.1.4",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-import": "^2.22.1",
Expand All @@ -113,12 +100,14 @@
"eslint-plugin-react": "^7.16.0",
"eslint-plugin-react-hooks": "^4.2.0",
"jest-sonar-reporter": "^2.0.0",
"jsdom": "^21.1.1",
"prettier": "^1.19.1",
"react-test-renderer": "^17.0.2",
"jsdom": "^23.0.1",
"prettier": "^3.1.1",
"vite": "^4.2.1",
"vite-plugin-pwa": "^0.14.7",
"vite-plugin-pwa": "^0.19.2",
"vite-tsconfig-paths": "^3.6.0",
"vitest": "^0.29.7"
},
"volta": {
"node": "20.10.0"
}
}
6 changes: 2 additions & 4 deletions public/configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"PEARL_API_URL": "http://localhost:8080",
"_PEARL_API_URL_COMMENT_": "url of Pearl API",

"PEARL_AUTHENTICATION_MODE": "keycloak",
"_PEARL_AUTHENTICATION_MODE_COMMENT": "The mode of authentication. Currently, App is supporting 'anonymous'",
"CHAT_URL": "",
"_CHAT_URL_COMMENT_": "url of Pearl Chat"
"PEARL_AUTHENTICATION_MODE": "anonymous",
"_PEARL_AUTHENTICATION_MODE_COMMENT": "The mode of authentication. Supported values 'anonymous' and 'keycloak' "
}
Loading

0 comments on commit ea48f7e

Please sign in to comment.