From 0d3dbbc669b9deffe7a1b955d06443a483ad8135 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Wed, 10 Jan 2024 11:32:04 +0100 Subject: [PATCH 01/17] CM-446: added frontend skeleton and basic config --- .babelrc | 12 + .eslintrc | 23 + .eslintrc.json | 26 + .github/workflows/CI_and_build copy.yml | 44 ++ .github/workflows/ci.yml | 23 + .../workflows/core-mis-test-server-deploy.yml | 31 + .github/workflows/eslint_check.yml | 30 + .github/workflows/npmpublish.yml | 50 ++ .gitignore | 23 + .priettierrc | 6 + GNU AFFERO GENERAL PUBLIC LICENSE.md | 660 ++++++++++++++++++ LICENSE.md | 13 + package.json | 45 ++ rollup.config.js | 40 ++ sonar-project.properties | 6 + src/index.js | 9 + src/translations/en.json | 2 + 17 files changed, 1043 insertions(+) create mode 100644 .babelrc create mode 100644 .eslintrc create mode 100644 .eslintrc.json create mode 100644 .github/workflows/CI_and_build copy.yml create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/core-mis-test-server-deploy.yml create mode 100644 .github/workflows/eslint_check.yml create mode 100644 .github/workflows/npmpublish.yml create mode 100644 .gitignore create mode 100644 .priettierrc create mode 100644 GNU AFFERO GENERAL PUBLIC LICENSE.md create mode 100644 LICENSE.md create mode 100644 package.json create mode 100644 rollup.config.js create mode 100644 sonar-project.properties create mode 100644 src/index.js create mode 100644 src/translations/en.json diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..1693bbf --- /dev/null +++ b/.babelrc @@ -0,0 +1,12 @@ +{ + "presets": [ + ["@babel/preset-env", { + "modules": false + }], + ["@babel/preset-react"] + ], + "plugins": [ + "@babel/plugin-transform-runtime", + "@babel/plugin-proposal-class-properties" + ] +} diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..0b6415f --- /dev/null +++ b/.eslintrc @@ -0,0 +1,23 @@ +{ + "parser": "babel-eslint", + "extends": [ + "standard", + "standard-react" + ], + "env": { + "es6": true + }, + "plugins": [ + "react" + ], + "parserOptions": { + "sourceType": "module" + }, + "rules": { + // don't force es6 functions to include space before paren + "space-before-function-paren": 0, + + // allow specifying true explicitly for boolean props + "react/jsx-boolean-value": 0 + } +} \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..2317806 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,26 @@ +{ + "env": { + "browser": true, + "es2021": true + }, + "extends": [ + "plugin:react/recommended", + "airbnb" + ], + "overrides": [ + ], + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, + "plugins": [ + "react" + ], + "rules": { + "react/prop-types": "off", + "no-shadow": "off", // disabled due to use of bindActionCreators + "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }], // disabled due to naming consistency with other modules + "import/no-unresolved": "off", // disable due to module architecture. For modules most references are marked as unresolved + "max-len": ["error", { "code": 120 }] + } +} diff --git a/.github/workflows/CI_and_build copy.yml b/.github/workflows/CI_and_build copy.yml new file mode 100644 index 0000000..fb19bf0 --- /dev/null +++ b/.github/workflows/CI_and_build copy.yml @@ -0,0 +1,44 @@ +# This is a basic workflow to help you get started with Actions + +name: Build + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + pull_request: + branches: [ main, develop ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [16.x] + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run : yarn install + - name: build + run : yarn build + - name: Check build status + run: | + if [ -d "dist" ]; then + echo "Build successful!" + else + echo "Build failed!" + exit 1 + fi diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..da93b2d --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,23 @@ +name: Sonar CI pipeline +on: + push: + branches: + - main + - 'release/**' + - develop + - 'feature/**' + pull_request: + types: [opened, synchronize, reopened] +jobs: + sonarcloud: + name: SonarCloud + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/core-mis-test-server-deploy.yml b/.github/workflows/core-mis-test-server-deploy.yml new file mode 100644 index 0000000..466de10 --- /dev/null +++ b/.github/workflows/core-mis-test-server-deploy.yml @@ -0,0 +1,31 @@ +name: CoreMIS Server Deployment +on: + push: + branches: + - develop + +jobs: + rebuild-test-server: + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Set up SSH + run: | + mkdir -p ~/.ssh + echo "${{ secrets.CORE_MIS_DEPLOYMENT_SSH_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -H ${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} >> ~/.ssh/known_hosts + env: + CORE_MIS_DEPLOYMENT_SSH_KEY: ${{ secrets.CORE_MIS_DEPLOYMENT_SSH_KEY }} + CORE_MIS_DEPLOYMENT_USER: ${{ secrets.CORE_MIS_DEPLOYMENT_USER }} + CORE_MIS_DEPLOYMENT_HOST: ${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} + + - name: Run Docker Compose + run: | + ssh -o StrictHostKeyChecking=no -T ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}@${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} -p 1022 + ssh ${{ secrets.CORE_MIS_DEPLOYMENT_USER }}@${{ secrets.CORE_MIS_DEPLOYMENT_HOST }} -p 1022 << EOF + cd coreMIS/ + docker-compose build backend gateway && docker-compose up -d + EOF diff --git a/.github/workflows/eslint_check.yml b/.github/workflows/eslint_check.yml new file mode 100644 index 0000000..c30cdac --- /dev/null +++ b/.github/workflows/eslint_check.yml @@ -0,0 +1,30 @@ +name: ESLint + +on: + push: + branches: + - main + - develop + pull_request: + branches: + - main + - develop + +jobs: + lint: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: 14 + + - name: Install dependencies + run: yarn install + + - name: Run ESLint + run: npx eslint src diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml new file mode 100644 index 0000000..2336d08 --- /dev/null +++ b/.github/workflows/npmpublish.yml @@ -0,0 +1,50 @@ +# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created +# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages + +name: Node.js Package + +on: + release: + types: [created] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 12 + - run: yarn install + - run: yarn build + + publish-npm: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 12 + registry-url: https://registry.npmjs.org/ + scope: openimis + - run: yarn install + - run: yarn build + - run: npm publish --access public + env: + NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + + publish-gpr: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 12 + registry-url: https://npm.pkg.github.com/ + - run: yarn install + - run: yarn build + - run: npm publish + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1addfc3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/ignore-files/ for more about ignoring files. + +# dependencies +node_modules + +# builds +build +dist +.rpt2_cache + +# misc +.DS_Store +.env +.env.local +.env.development.local +.env.test.local +.env.production.local +.editorconfig + +npm-debug.log* +yarn-debug.log* +yarn-error.log* +yarn.lock diff --git a/.priettierrc b/.priettierrc new file mode 100644 index 0000000..0dc119f --- /dev/null +++ b/.priettierrc @@ -0,0 +1,6 @@ +{ + "trailingComma": "all", + "printWidth": 120, + "quoteProps": "preserve", + "arrowParens": "always" +} diff --git a/GNU AFFERO GENERAL PUBLIC LICENSE.md b/GNU AFFERO GENERAL PUBLIC LICENSE.md new file mode 100644 index 0000000..88f1b84 --- /dev/null +++ b/GNU AFFERO GENERAL PUBLIC LICENSE.md @@ -0,0 +1,660 @@ +### GNU AFFERO GENERAL PUBLIC LICENSE + +Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +### Preamble + +The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains +free software for all its users. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + +Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + +A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + +The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + +An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing +under this license. + +The precise terms and conditions for copying, distribution and +modification follow. + +### TERMS AND CONDITIONS + +#### 0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public +License. + +"Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of +an exact copy. The resulting work is called a "modified version" of +the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based +on the Program. + +To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user +through a computer network, with no transfer of a copy, is not +conveying. + +An interactive user interface displays "Appropriate Legal Notices" to +the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +#### 1. Source Code. + +The "source code" for a work means the preferred form of the work for +making modifications to it. "Object code" means any non-source form of +a work. + +A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same +work. + +#### 2. Basic Permissions. + +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in force. +You may convey covered works to others for the sole purpose of having +them make modifications exclusively for you, or provide you with +facilities for running those works, provided that you comply with the +terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for +you must do so exclusively on your behalf, under your direction and +control, on terms that prohibit them from making any copies of your +copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 makes +it unnecessary. + +#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License with +respect to the covered work, and you disclaim any intention to limit +operation or modification of the work as a means of enforcing, against +the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. + +#### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + +#### 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these +conditions: + +- a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. +- b) The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in section 4 + to "keep intact all notices". +- c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. +- d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + +#### 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways: + +- a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. +- b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. +- c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. +- d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. +- e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, +family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a +consumer product, doubtful cases shall be resolved in favor of +coverage. For a particular product received by a particular user, +"normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected +to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or +non-consumer uses, unless such uses represent the only significant +mode of use of the product. + +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to +install and execute modified versions of a covered work in that User +Product from a modified version of its Corresponding Source. The +information must suffice to ensure that the continued functioning of +the modified object code is in no case prevented or interfered with +solely because modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network. + +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + +#### 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders +of that material) supplement the terms of this License with terms: + +- a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or +- b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or +- c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or +- d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or +- e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or +- f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. + +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. + +#### 8. Termination. + +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + +#### 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run +a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + +#### 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + +#### 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned +or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + +A patent license is "discriminatory" if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on +the non-exercise of one or more of the rights that are specifically +granted under this License. You may not convey a covered work if you +are a party to an arrangement with a third party that is in the +business of distributing software, under which you make payment to the +third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties +who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by +you (or copies made from those copies), or (b) primarily for and in +connection with specific products or compilations that contain the +covered work, unless you entered into that arrangement, or that patent +license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + +#### 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to +terms that obligate you to collect a royalty for further conveying +from those to whom you convey the Program, the only way you could +satisfy both those terms and this License would be to refrain entirely +from conveying the Program. + +#### 13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your +version supports such interaction) an opportunity to receive the +Corresponding Source of your version by providing access to the +Corresponding Source from a network server at no charge, through some +standard or customary means of facilitating copying of software. This +Corresponding Source shall include the Corresponding Source for any +work covered by version 3 of the GNU General Public License that is +incorporated pursuant to the following paragraph. + +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + +#### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU Affero General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever +published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions +of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +#### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +#### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +#### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + +To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively state +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper +mail. + +If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for +the specific requirements. + +You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU AGPL, see . \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..fec6d69 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,13 @@ +The program users must agree to the following terms: + +License notices +This program is free software: you can redistribute it and/or modify it under the terms of the GNU AGPL v3 License as published by the Free Software Foundation, version 3 of the License. +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU AGPL v3 License for more details www.gnu.org. + +Disclaimer of Warranty +There is no warranty for the program, to the extent permitted by applicable law; except when otherwise stated in writing the copyright holders and/or other parties provide the program "as is" without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the program is with you. Should the program prove defective, you assume the cost of all necessary servicing, repair or correction. + +Limitation of Liability +In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who modifies and/or conveys the program as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages. + +In case of dispute arising out or in relation to the use of the program, it is subject to the public law of Switzerland. The place of jurisdiction is Berne. \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..adc7e52 --- /dev/null +++ b/package.json @@ -0,0 +1,45 @@ +{ + "name": "@openimis/fe-deduplication", + "version": "1.2.0-rc1", + "license": "AGPL-3.0-only", + "description": "openIMIS Frontend Deduplication module", + "repository": "openimis/openimis-fe-deduplication_js", + "main": "dist/index.js", + "module": "dist/index.es.js", + "engines": { + "node": ">=8", + "npm": ">=5" + }, + "scripts": { + "build": "rollup -c", + "start": "rollup -c -w", + "format": "prettier src -w", + "prepare":"npm run build" + }, + "devDependencies": { + "@babel/cli": "^7.8.4", + "@babel/core": "^7.9.6", + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.9.6", + "@babel/preset-env": "^7.9.6", + "@babel/preset-react": "^7.9.4", + "@babel/runtime": "^7.9.6", + "@rollup/plugin-babel": "^5.0.0", + "@rollup/plugin-commonjs": "^11.1.0", + "@rollup/plugin-json": "^4.0.3", + "@rollup/plugin-node-resolve": "^7.1.3", + "@rollup/plugin-url": "^5.0.0", + "moment": "^2.25.3", + "prop-types": "^15.7.2", + "react-autosuggest": "^10.0.2", + "react-intl": "^2.9.0", + "react-router-dom": "^5.2.0", + "redux": "^4.0.5", + "redux-api-middleware": "^3.2.1", + "rollup": "^2.10.0" + }, + "files": [ + "dist" + ], + "dependencies": {} +} diff --git a/rollup.config.js b/rollup.config.js new file mode 100644 index 0000000..e9c148c --- /dev/null +++ b/rollup.config.js @@ -0,0 +1,40 @@ +import babel from '@rollup/plugin-babel' +import json from '@rollup/plugin-json' +import pkg from './package.json' + +export default { + input: 'src/index.js', + output: [ + { + file: pkg.module, + format: 'es', + sourcemap: true + }, + { + file: 'dist/index.js', + format: 'cjs', + sourcemap: true + } + ], + external: [ + /^@babel.*/, + /^@date-io\/.*/, + /^@material-ui\/.*/, + /^@openimis.*/, + "classnames", + "clsx", + "history", + /^lodash.*/, + "moment", + "prop-types", + /^react.*/, + /^redux.*/ + ], + plugins: [ + json(), + babel({ + exclude: 'node_modules/**', + babelHelpers: 'runtime' + }), + ] +} \ No newline at end of file diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..3f611a8 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,6 @@ +sonar.projectKey=openimis_openimis-fe-deduplication_js +sonar.organization=openimis-1 +sonar.projectName=openimis-fe-deduplication_js + +sonar.sources=src +sonar.sourceEncoding=UTF-8 diff --git a/src/index.js b/src/index.js new file mode 100644 index 0000000..fd5285e --- /dev/null +++ b/src/index.js @@ -0,0 +1,9 @@ +import messages_en from "./translations/en.json"; + +const DEFAULT_CONFIG = { + "translations": [{ key: "en", messages: messages_en }], +} + +export const DeduplicationModule = (cfg) => { + return { ...DEFAULT_CONFIG, ...cfg }; +} \ No newline at end of file diff --git a/src/translations/en.json b/src/translations/en.json new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/src/translations/en.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file From 3c8bb64c8312ec32aed64ed4233b6bba2a22049d Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Thu, 11 Jan 2024 12:34:16 +0100 Subject: [PATCH 02/17] CM-452: added button deduplicate --- package.json | 13 +- .../DeduplicationFieldSelectionDialog.js | 114 ++++++++++++++++++ src/index.js | 8 +- src/translations/en.json | 3 + 4 files changed, 129 insertions(+), 9 deletions(-) create mode 100644 src/components/dialogs/DeduplicationFieldSelectionDialog.js diff --git a/package.json b/package.json index adc7e52..5b6bde3 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,12 @@ "@rollup/plugin-json": "^4.0.3", "@rollup/plugin-node-resolve": "^7.1.3", "@rollup/plugin-url": "^5.0.0", - "moment": "^2.25.3", - "prop-types": "^15.7.2", - "react-autosuggest": "^10.0.2", - "react-intl": "^2.9.0", - "react-router-dom": "^5.2.0", - "redux": "^4.0.5", - "redux-api-middleware": "^3.2.1", + "eslint": "^7.32.0 || ^8.2.0", + "eslint-config-airbnb": "^19.0.4", + "eslint-plugin-import": "^2.25.3", + "eslint-plugin-jsx-a11y": "^6.5.1", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0", "rollup": "^2.10.0" }, "files": [ diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js new file mode 100644 index 0000000..f802a76 --- /dev/null +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -0,0 +1,114 @@ +import React, { useState } from "react"; +import { injectIntl } from "react-intl"; +import Button from "@material-ui/core/Button"; +import Dialog from "@material-ui/core/Dialog"; +import DialogActions from "@material-ui/core/DialogActions"; +import DialogContent from "@material-ui/core/DialogContent"; +import DialogTitle from "@material-ui/core/DialogTitle"; +import { + formatMessage, + formatMessageWithValues, +} from "@openimis/fe-core"; +import { withTheme, withStyles } from "@material-ui/core/styles"; +import { connect } from "react-redux"; +import { bindActionCreators } from "redux"; + +const styles = (theme) => ({ + item: theme.paper.item, +}); + +const DeduplicationFieldSelectionDialog = ({ + intl, + classes, + benefitPlan, +}) => { + console.log('intl', intl); + + const [isOpen, setIsOpen] = useState(false); + + const handleOpen = () => { + setIsOpen(true); + }; + + const handleClose = () => { + setIsOpen(false); + }; + + return ( + <> + + + + Pr + + + <> + + +
+
+
+
+ +
+
+ + + + ); +}; + +const mapStateToProps = (state, props) => ({ + rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [], + confirmed: state.core.confirmed, +}); + +const mapDispatchToProps = (dispatch) => bindActionCreators({ +}, dispatch); + +export default injectIntl(withTheme(withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(DeduplicationFieldSelectionDialog)))); diff --git a/src/index.js b/src/index.js index fd5285e..0dc77b0 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,13 @@ import messages_en from "./translations/en.json"; +import DeduplicationFieldSelectionDialog from "./components/dialogs/DeduplicationFieldSelectionDialog"; const DEFAULT_CONFIG = { - "translations": [{ key: "en", messages: messages_en }], + translations: [{ key: "en", messages: messages_en }], + 'deduplication.deduplicationFieldSelectionDialog': [ + DeduplicationFieldSelectionDialog + ] } export const DeduplicationModule = (cfg) => { return { ...DEFAULT_CONFIG, ...cfg }; -} \ No newline at end of file +} diff --git a/src/translations/en.json b/src/translations/en.json index 7a73a41..4502088 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1,2 +1,5 @@ { + "deduplication.deduplicate": "Deduplicate", + "deduplication.deduplicate.title": "Deduplication - {benefitPlanName}", + "dedulication.deduplicate.button.cancel": "Cancel" } \ No newline at end of file From fd69e1b1d1da0e6b7a0f4afa52ca53e759105de9 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Thu, 11 Jan 2024 12:36:05 +0100 Subject: [PATCH 03/17] CM-446: fixed package.json --- package.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index adc7e52..5b6bde3 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,12 @@ "@rollup/plugin-json": "^4.0.3", "@rollup/plugin-node-resolve": "^7.1.3", "@rollup/plugin-url": "^5.0.0", - "moment": "^2.25.3", - "prop-types": "^15.7.2", - "react-autosuggest": "^10.0.2", - "react-intl": "^2.9.0", - "react-router-dom": "^5.2.0", - "redux": "^4.0.5", - "redux-api-middleware": "^3.2.1", + "eslint": "^7.32.0 || ^8.2.0", + "eslint-config-airbnb": "^19.0.4", + "eslint-plugin-import": "^2.25.3", + "eslint-plugin-jsx-a11y": "^6.5.1", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0", "rollup": "^2.10.0" }, "files": [ From d407b4b2df9bdd8186537d0fd6fa7fab8ff83f87 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Thu, 11 Jan 2024 13:25:13 +0100 Subject: [PATCH 04/17] CM-452: added fixes in component --- .../DeduplicationFieldSelectionDialog.js | 109 +++++++++--------- src/index.js | 17 ++- 2 files changed, 61 insertions(+), 65 deletions(-) diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js index f802a76..a103ed4 100644 --- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -1,31 +1,29 @@ -import React, { useState } from "react"; -import { injectIntl } from "react-intl"; -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import React, { useState } from 'react'; +import { injectIntl } from 'react-intl'; +import Button from '@material-ui/core/Button'; +import Dialog from '@material-ui/core/Dialog'; +import DialogActions from '@material-ui/core/DialogActions'; +import DialogContent from '@material-ui/core/DialogContent'; +import DialogTitle from '@material-ui/core/DialogTitle'; import { formatMessage, formatMessageWithValues, -} from "@openimis/fe-core"; -import { withTheme, withStyles } from "@material-ui/core/styles"; -import { connect } from "react-redux"; -import { bindActionCreators } from "redux"; +} from '@openimis/fe-core'; +import { withTheme, withStyles } from '@material-ui/core/styles'; +import { connect } from 'react-redux'; +import { bindActionCreators } from 'redux'; const styles = (theme) => ({ item: theme.paper.item, }); -const DeduplicationFieldSelectionDialog = ({ +function DeduplicationFieldSelectionDialog({ intl, classes, benefitPlan, -}) => { - console.log('intl', intl); - +}) { const [isOpen, setIsOpen] = useState(false); - + const handleOpen = () => { setIsOpen(true); }; @@ -36,24 +34,24 @@ const DeduplicationFieldSelectionDialog = ({ return ( <> - - - - Pr + {formatMessageWithValues(intl, 'deduplication', 'deduplicate.title', { benefitPlanName: benefitPlan.name })} - - <> - - +
-
-
-
+
-
@@ -101,7 +96,7 @@ const DeduplicationFieldSelectionDialog = ({
); -}; +} const mapStateToProps = (state, props) => ({ rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [], @@ -111,4 +106,6 @@ const mapStateToProps = (state, props) => ({ const mapDispatchToProps = (dispatch) => bindActionCreators({ }, dispatch); -export default injectIntl(withTheme(withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(DeduplicationFieldSelectionDialog)))); +export default injectIntl( + withTheme(withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(DeduplicationFieldSelectionDialog))), +); diff --git a/src/index.js b/src/index.js index 0dc77b0..ae6888e 100644 --- a/src/index.js +++ b/src/index.js @@ -1,13 +1,12 @@ -import messages_en from "./translations/en.json"; -import DeduplicationFieldSelectionDialog from "./components/dialogs/DeduplicationFieldSelectionDialog"; +import messagesEn from './translations/en.json'; +import DeduplicationFieldSelectionDialog from './components/dialogs/DeduplicationFieldSelectionDialog'; const DEFAULT_CONFIG = { - translations: [{ key: "en", messages: messages_en }], + translations: [{ key: 'en', messages: messagesEn }], 'deduplication.deduplicationFieldSelectionDialog': [ - DeduplicationFieldSelectionDialog - ] -} + DeduplicationFieldSelectionDialog, + ], +}; -export const DeduplicationModule = (cfg) => { - return { ...DEFAULT_CONFIG, ...cfg }; -} +// eslint-disable-next-line import/prefer-default-export +export const DeduplicationModule = (cfg) => ({ ...DEFAULT_CONFIG, ...cfg }); From 954db031e88e18776c460249b924bb2a68f2c974 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Thu, 11 Jan 2024 13:46:47 +0100 Subject: [PATCH 05/17] CM-452: adjustments --- .../dialogs/DeduplicationFieldSelectionDialog.js | 9 ++++----- src/translations/en.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js index a103ed4..341fd7b 100644 --- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -22,6 +22,8 @@ function DeduplicationFieldSelectionDialog({ classes, benefitPlan, }) { + if (!benefitPlan) return null; + const [isOpen, setIsOpen] = useState(false); const handleOpen = () => { @@ -41,10 +43,7 @@ function DeduplicationFieldSelectionDialog({ className={classes.button} style={{ border: '0px', - textAlign: 'right', - display: 'block', - marginLeft: 'auto', - marginRight: 0, + marginTop: '6px', }} > {formatMessage(intl, 'deduplication', 'deduplicate')} @@ -98,7 +97,7 @@ function DeduplicationFieldSelectionDialog({ ); } -const mapStateToProps = (state, props) => ({ +const mapStateToProps = (state) => ({ rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [], confirmed: state.core.confirmed, }); diff --git a/src/translations/en.json b/src/translations/en.json index 4502088..2cc09c7 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1,5 +1,5 @@ { "deduplication.deduplicate": "Deduplicate", "deduplication.deduplicate.title": "Deduplication - {benefitPlanName}", - "dedulication.deduplicate.button.cancel": "Cancel" + "deduplication.deduplicate.button.cancel": "Cancel" } \ No newline at end of file From 5fb33c92839e6c2c548fc3e53cca5421311954eb Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Thu, 11 Jan 2024 14:25:33 +0100 Subject: [PATCH 06/17] CM-453: added skeleton for deduplication init --- .../DeduplicationFieldSelectionDialog.js | 21 +++++++- .../pickers/DeduplicationFieldPicker.js | 51 +++++++++++++++++++ src/translations/en.json | 5 +- 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 src/components/pickers/DeduplicationFieldPicker.js diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js index 341fd7b..b7b7a8f 100644 --- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -12,6 +12,7 @@ import { import { withTheme, withStyles } from '@material-ui/core/styles'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; +import DeduplicationFieldPicker from '../pickers/DeduplicationFieldPicker'; const styles = (theme) => ({ item: theme.paper.item, @@ -65,7 +66,14 @@ function DeduplicationFieldSelectionDialog({ > {formatMessageWithValues(intl, 'deduplication', 'deduplicate.title', { benefitPlanName: benefitPlan.name })} - + + []} + /> +
-
+
+ +
edge.node) ?? []; + const uniqueValues = [...new Map(value?.map((role) => [role.id, role])).values()]; + + return ( + o?.name} + onChange={(option) => onChange(option, option?.name)} + filterOptions={filterOptions} + filterSelectedOptions={filterSelectedOptions} + onInputChange={() => setSearchString(searchString)} + /> + ); +} + +export default DeduplicationFieldPicker; diff --git a/src/translations/en.json b/src/translations/en.json index 2cc09c7..2682ae4 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1,5 +1,8 @@ { "deduplication.deduplicate": "Deduplicate", "deduplication.deduplicate.title": "Deduplication - {benefitPlanName}", - "deduplication.deduplicate.button.cancel": "Cancel" + "deduplication.deduplicate.button.cancel": "Cancel", + "deduplication.deduplicate.fields": "Duplicate Detection Field Selection", + "deduplication.deduplicate.fields.placeholder": "Duplicate Detection Field Selection", + "deduplicate.button.showDuplicateSummary": "Show Duplicate Summary" } \ No newline at end of file From 5396b7da16c9d769e14dce874d9d6a0bd6183716 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Fri, 12 Jan 2024 11:09:06 +0100 Subject: [PATCH 07/17] CM-453: added working selection fields based on programme schema --- .../DeduplicationFieldSelectionDialog.js | 10 ++++++-- .../pickers/DeduplicationFieldPicker.js | 24 +++++++++---------- src/constants.js | 6 +++++ 3 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 src/constants.js diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js index b7b7a8f..0a12120 100644 --- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -25,6 +25,7 @@ function DeduplicationFieldSelectionDialog({ }) { if (!benefitPlan) return null; + const [selectedValues, setSelectedValues] = useState([]); const [isOpen, setIsOpen] = useState(false); const handleOpen = () => { @@ -35,6 +36,10 @@ function DeduplicationFieldSelectionDialog({ setIsOpen(false); }; + const handlePickerChange = (selectedOptions) => { + setSelectedValues(selectedOptions); + }; + return ( <> @@ -116,6 +129,15 @@ function DeduplicationFieldSelectionDialog({
+ + {showSummaryDialog && ( + + )} ); } diff --git a/src/components/dialogs/DeduplicationSummaryDialog.js b/src/components/dialogs/DeduplicationSummaryDialog.js new file mode 100644 index 0000000..4ec1641 --- /dev/null +++ b/src/components/dialogs/DeduplicationSummaryDialog.js @@ -0,0 +1,96 @@ +import React, { useState } from 'react'; +import { injectIntl } from 'react-intl'; +import Button from '@material-ui/core/Button'; +import Dialog from '@material-ui/core/Dialog'; +import DialogActions from '@material-ui/core/DialogActions'; +import DialogContent from '@material-ui/core/DialogContent'; +import DialogTitle from '@material-ui/core/DialogTitle'; +import { formatMessage } from '@openimis/fe-core'; +import { withTheme, withStyles } from '@material-ui/core/styles'; +import { connect } from 'react-redux'; +import { bindActionCreators } from 'redux'; +import DeduplicationSummaryTable from '../tables/DeduplicationSummaryTable'; + +const styles = (theme) => ({ + item: theme.paper.item, +}); + +function DeduplicationSummaryDialog({ + intl, + benefitPlan, + handleClose, + showSummaryDialog, +}) { + if (!benefitPlan) return null; + + return ( + + + {formatMessage(intl, 'deduplication', 'deduplicate.summary.title')} + + + + + +
+
+ +
+
+ +
+
+ + + ); +} + +const mapStateToProps = (state) => ({ + rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [], + confirmed: state.core.confirmed, +}); + +const mapDispatchToProps = (dispatch) => bindActionCreators({ +}, dispatch); + +export default injectIntl( + withTheme(withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(DeduplicationSummaryDialog))), +); diff --git a/src/components/tables/DeduplicationSummaryTable.js b/src/components/tables/DeduplicationSummaryTable.js new file mode 100644 index 0000000..f953c31 --- /dev/null +++ b/src/components/tables/DeduplicationSummaryTable.js @@ -0,0 +1,86 @@ +import React, { useEffect } from 'react'; +import { useSelector, useDispatch } from 'react-redux'; + +import { + TableContainer, TableHead, TableBody, Table, TableCell, TableRow, Paper, +} from '@material-ui/core'; +import { makeStyles } from '@material-ui/styles'; + +import { useModulesManager, ProgressOrError, useTranslations } from '@openimis/fe-core'; +import { MODULE_NAME } from '../../constants'; + +const useStyles = makeStyles((theme) => ({ + footer: { + marginInline: 16, + marginBlock: 12, + }, + headerTitle: theme.table.title, + actionCell: { + width: 60, + }, + header: theme.table.header, +})); + +const DEDUPLICATION_SUMMARY_HEADERS = [ + 'deduplication.deduplicationSummaryTable.group', + 'deduplication.deduplicationSummaryTable.duplicates' +]; + +function DeduplicationSummaryTable() { + //const dispatch = useDispatch(); + const modulesManager = useModulesManager(); + const classes = useStyles(); + const { formatMessage } = useTranslations(MODULE_NAME, modulesManager); + //const { + // fetchingFamilyMembers, familyMembers, errorFamilyMembers + //} = useSelector((store) => store.insuree); + + const results = [ + {group: "Firstname: John, Surname: Doe, DOB: 1995-01-2020", duplicates: 2}, + {group: "Firstname: John, Surname: Test, DOB: 1995-01-2020", duplicates: 4}, + {group: "Firstname: Michael, Surname: Doe, DOB: 1995-01-2020", duplicates: 10}, + {group: "Firstname :Dennis, Surname: Jin, DOB: 1994-01-2020", duplicates: 20}, + ]; + + //useEffect(() => { + //if (!insuree) return; + + //dispatch(fetchFamilyMembers(modulesManager, [`familyUuid: "${insuree.family.uuid}"`])); + //}, [insuree]); + + return ( + + + + + {DEDUPLICATION_SUMMARY_HEADERS.map((header) => ( + + {' '} + {formatMessage(header)} + {' '} + + ))} + + + + {results?.map((result) => ( + + + {' '} + {result.group} + {' '} + + + {' '} + {result.duplicates} + {' '} + + + ))} + +
+ + ); +} + +export default DeduplicationSummaryTable; diff --git a/src/translations/en.json b/src/translations/en.json index 2682ae4..ceb3e4e 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -4,5 +4,9 @@ "deduplication.deduplicate.button.cancel": "Cancel", "deduplication.deduplicate.fields": "Duplicate Detection Field Selection", "deduplication.deduplicate.fields.placeholder": "Duplicate Detection Field Selection", - "deduplicate.button.showDuplicateSummary": "Show Duplicate Summary" + "deduplication.deduplicate.button.showDuplicateSummary": "Show Duplicate Summary", + "deduplication.deduplicate.summary.title": "Deduplication Summary", + "deduplication.deduplicate.button.createDeduplicationReviewTask": "Create Deduplication Review Tasks", + "deduplication.deduplicationSummaryTable.group": "Group", + "deduplication.deduplicationSummaryTable.duplicates": "Duplicates" } \ No newline at end of file From 7c69f32dbd41946ff46b552b8951616038e40018 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Tue, 16 Jan 2024 17:18:25 +0100 Subject: [PATCH 09/17] CM-454: connect with the backend --- src/actions.js | 15 +++++ .../DeduplicationFieldSelectionDialog.js | 4 +- .../dialogs/DeduplicationSummaryDialog.js | 14 ++++- .../tables/DeduplicationSummaryTable.js | 37 ++++++------ src/index.js | 2 + src/reducer.js | 56 +++++++++++++++++++ src/util/action-type.js | 5 ++ src/util/styles.js | 24 ++++++++ 8 files changed, 132 insertions(+), 25 deletions(-) create mode 100644 src/actions.js create mode 100644 src/reducer.js create mode 100644 src/util/action-type.js create mode 100644 src/util/styles.js diff --git a/src/actions.js b/src/actions.js new file mode 100644 index 0000000..19eb1a5 --- /dev/null +++ b/src/actions.js @@ -0,0 +1,15 @@ +import { + graphql, + formatQuery, +} from '@openimis/fe-core'; +import { ACTION_TYPE } from './reducer'; + +const DEDUPLICATION_SUMMARY_FULL_PROJECTION = () => [ + 'rows {count, columnValues}', +]; + +// eslint-disable-next-line import/prefer-default-export +export function fetchDeduplicationSummary(params) { + const payload = formatQuery('beneficiaryDeduplicationSummary', params, DEDUPLICATION_SUMMARY_FULL_PROJECTION()); + return graphql(payload, ACTION_TYPE.GET_DEDUPLICATION_SUMMARY); +} diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js index 59ea222..fb183b3 100644 --- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -36,7 +36,6 @@ function DeduplicationFieldSelectionDialog({ const handleClose = () => { setIsOpen(false); - setSelectedValues([]); }; const handlePickerChange = (selectedOptions) => { @@ -44,8 +43,8 @@ function DeduplicationFieldSelectionDialog({ }; const handleOpenNextDialog = () => { - handleClose(); setShowSummaryDialog(true); + handleClose(); }; const handleSummaryDialogClose = () => { @@ -136,6 +135,7 @@ function DeduplicationFieldSelectionDialog({ benefitPlan={benefitPlan} handleClose={handleSummaryDialogClose} showSummaryDialog={showSummaryDialog} + selectedValues={selectedValues} /> )} diff --git a/src/components/dialogs/DeduplicationSummaryDialog.js b/src/components/dialogs/DeduplicationSummaryDialog.js index 4ec1641..6c87791 100644 --- a/src/components/dialogs/DeduplicationSummaryDialog.js +++ b/src/components/dialogs/DeduplicationSummaryDialog.js @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React from 'react'; import { injectIntl } from 'react-intl'; import Button from '@material-ui/core/Button'; import Dialog from '@material-ui/core/Dialog'; @@ -10,6 +10,7 @@ import { withTheme, withStyles } from '@material-ui/core/styles'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import DeduplicationSummaryTable from '../tables/DeduplicationSummaryTable'; +import { fetchDeduplicationSummary } from '../../actions'; const styles = (theme) => ({ item: theme.paper.item, @@ -20,9 +21,14 @@ function DeduplicationSummaryDialog({ benefitPlan, handleClose, showSummaryDialog, + selectedValues, }) { if (!benefitPlan) return null; + // Extract the 'id' values from each object in the array + const columns = selectedValues.map((value) => value.id); + const columnParam = `columns: ${JSON.stringify(columns)}`; + return ( - + ({ const DEDUPLICATION_SUMMARY_HEADERS = [ 'deduplication.deduplicationSummaryTable.group', - 'deduplication.deduplicationSummaryTable.duplicates' + 'deduplication.deduplicationSummaryTable.duplicates', ]; -function DeduplicationSummaryTable() { - //const dispatch = useDispatch(); +function DeduplicationSummaryTable({ + columnParam, benefitPlan, fetchDeduplicationSummary, +}) { + const dispatch = useDispatch(); const modulesManager = useModulesManager(); const classes = useStyles(); const { formatMessage } = useTranslations(MODULE_NAME, modulesManager); - //const { - // fetchingFamilyMembers, familyMembers, errorFamilyMembers - //} = useSelector((store) => store.insuree); + const { + fetchingSummary, summary, errorSummary, + } = useSelector((store) => store.deduplication); - const results = [ - {group: "Firstname: John, Surname: Doe, DOB: 1995-01-2020", duplicates: 2}, - {group: "Firstname: John, Surname: Test, DOB: 1995-01-2020", duplicates: 4}, - {group: "Firstname: Michael, Surname: Doe, DOB: 1995-01-2020", duplicates: 10}, - {group: "Firstname :Dennis, Surname: Jin, DOB: 1994-01-2020", duplicates: 20}, - ]; - - //useEffect(() => { - //if (!insuree) return; - - //dispatch(fetchFamilyMembers(modulesManager, [`familyUuid: "${insuree.family.uuid}"`])); - //}, [insuree]); + useEffect(() => { + const params = [columnParam, `benefitPlanId: "${benefitPlan.id}"`]; + dispatch(fetchDeduplicationSummary(params)); + }, []); return ( @@ -63,16 +57,17 @@ function DeduplicationSummaryTable() { - {results?.map((result) => ( + + {summary?.map((result) => ( {' '} - {result.group} + {result.columnValues} {' '} {' '} - {result.duplicates} + {result.count} {' '} diff --git a/src/index.js b/src/index.js index ae6888e..5d5fdd7 100644 --- a/src/index.js +++ b/src/index.js @@ -1,8 +1,10 @@ import messagesEn from './translations/en.json'; import DeduplicationFieldSelectionDialog from './components/dialogs/DeduplicationFieldSelectionDialog'; +import reducer from './reducer'; const DEFAULT_CONFIG = { translations: [{ key: 'en', messages: messagesEn }], + reducers: [{ key: 'deduplication', reducer }], 'deduplication.deduplicationFieldSelectionDialog': [ DeduplicationFieldSelectionDialog, ], diff --git a/src/reducer.js b/src/reducer.js new file mode 100644 index 0000000..f5d6010 --- /dev/null +++ b/src/reducer.js @@ -0,0 +1,56 @@ +// Disabled due to consistency with other modules +/* eslint-disable default-param-last */ + +import { + parseData, + formatServerError, +} from '@openimis/fe-core'; +import { + ERROR, REQUEST, SUCCESS, +} from './util/action-type'; + +export const ACTION_TYPE = { + GET_DEDUPLICATION_SUMMARY: 'DEDUPLICATION_GET_DEDUPLICATION_SUMMARY', +}; + +function reducer( + state = { + submittingMutation: false, + mutation: {}, + fetchingSummary: false, + errorSummary: null, + fetchedSummary: false, + summary: [], + }, + action, +) { + switch (action.type) { + case REQUEST(ACTION_TYPE.GET_DEDUPLICATION_SUMMARY): + return { + ...state, + fetchingSummary: true, + fetchedSummary: false, + summary: null, + }; + case SUCCESS(ACTION_TYPE.GET_DEDUPLICATION_SUMMARY): + return { + ...state, + fetchingSummary: false, + fetchedSummary: true, + summary: action.payload.data.beneficiaryDeduplicationSummary.rows?.map((row) => ({ + ...row, + })), + errorSummary: null, + }; + case ERROR(ACTION_TYPE.GET_DEDUPLICATION_SUMMARY): + return { + ...state, + fetchingSummary: false, + errorSummary: formatServerError(action.payload), + }; + default: + return state; + } +} + +export default reducer; diff --git a/src/util/action-type.js b/src/util/action-type.js new file mode 100644 index 0000000..788e71a --- /dev/null +++ b/src/util/action-type.js @@ -0,0 +1,5 @@ +export const REQUEST = (actionTypeName) => `${actionTypeName}_REQ`; +export const SUCCESS = (actionTypeName) => `${actionTypeName}_RESP`; +export const ERROR = (actionTypeName) => `${actionTypeName}_ERR`; +export const CLEAR = (actionTypeName) => `${actionTypeName}_CLEAR`; +export const VALID = (actionTypeName) => `${actionTypeName}_VALID`; diff --git a/src/util/styles.js b/src/util/styles.js new file mode 100644 index 0000000..8ebced6 --- /dev/null +++ b/src/util/styles.js @@ -0,0 +1,24 @@ +export const defaultPageStyles = (theme) => ({ + page: theme.page, +}); + +export const defaultFilterStyles = (theme) => ({ + form: { + padding: 0, + }, + item: { + padding: theme.spacing(1), + }, +}); + +export const defaultHeadPanelStyles = (theme) => ({ + tableTitle: theme.table.title, + item: theme.paper.item, + fullHeight: { + height: '100%', + }, +}); + +export const defaultDialogStyles = (theme) => ({ + item: theme.paper.item, +}); From 3985916c79f7d86b735ad8d6159fb60c828f1816 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Tue, 16 Jan 2024 19:31:43 +0100 Subject: [PATCH 10/17] CM-454: added displaying columns group in more readible way --- src/components/tables/DeduplicationSummaryTable.js | 13 ++++++++++++- src/reducer.js | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/tables/DeduplicationSummaryTable.js b/src/components/tables/DeduplicationSummaryTable.js index 97e2f24..458ebeb 100644 --- a/src/components/tables/DeduplicationSummaryTable.js +++ b/src/components/tables/DeduplicationSummaryTable.js @@ -42,6 +42,17 @@ function DeduplicationSummaryTable({ dispatch(fetchDeduplicationSummary(params)); }, []); + function reshapeColumnValues(inputString) { + const columnValues = JSON.parse(inputString); + const formattedValues = Object.entries(columnValues).map(([key, value]) => { + const formattedKey = key.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase()); + const formattedValue = value !== null ? value : 'null'; + return `${formattedKey}: ${formattedValue}`; + }); + const resultString = formattedValues.join(', '); + return resultString; + } + return ( @@ -62,7 +73,7 @@ function DeduplicationSummaryTable({ {' '} - {result.columnValues} + {reshapeColumnValues(result.columnValues)} {' '} diff --git a/src/reducer.js b/src/reducer.js index f5d6010..5b5b602 100644 --- a/src/reducer.js +++ b/src/reducer.js @@ -2,7 +2,6 @@ /* eslint-disable default-param-last */ import { - parseData, formatServerError, } from '@openimis/fe-core'; import { From 9658f2138640a0e0d8924a4a5645545e41a768f0 Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Tue, 16 Jan 2024 19:43:44 +0100 Subject: [PATCH 11/17] CM-454: empty state once reopen modal to trigger summary --- src/components/dialogs/DeduplicationFieldSelectionDialog.js | 2 ++ src/components/dialogs/DeduplicationSummaryDialog.js | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js index fb183b3..aedf531 100644 --- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -31,6 +31,7 @@ function DeduplicationFieldSelectionDialog({ const [showSummaryDialog, setShowSummaryDialog] = useState(false); const handleOpen = () => { + setSelectedValues([]); setIsOpen(true); }; @@ -136,6 +137,7 @@ function DeduplicationFieldSelectionDialog({ handleClose={handleSummaryDialogClose} showSummaryDialog={showSummaryDialog} selectedValues={selectedValues} + setSelectedValues={setSelectedValues} /> )} diff --git a/src/components/dialogs/DeduplicationSummaryDialog.js b/src/components/dialogs/DeduplicationSummaryDialog.js index 6c87791..2f60f52 100644 --- a/src/components/dialogs/DeduplicationSummaryDialog.js +++ b/src/components/dialogs/DeduplicationSummaryDialog.js @@ -25,7 +25,6 @@ function DeduplicationSummaryDialog({ }) { if (!benefitPlan) return null; - // Extract the 'id' values from each object in the array const columns = selectedValues.map((value) => value.id); const columnParam = `columns: ${JSON.stringify(columns)}`; From 6ed575492a35830c79513f94eda4b82508d147ff Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 24 Jan 2024 09:48:02 +0100 Subject: [PATCH 12/17] CM-456: adjust fe to create deduplication tasks (#5) * CM-456: adjust fe to create deduplication tasks * CM-456: remove console log --------- Co-authored-by: Jan --- src/actions.js | 38 ++++++++++++++++++- .../DeduplicationFieldSelectionDialog.js | 1 + .../dialogs/DeduplicationSummaryDialog.js | 19 ++++++++-- .../tables/DeduplicationSummaryTable.js | 6 ++- src/reducer.js | 5 +++ src/translations/en.json | 3 +- 6 files changed, 66 insertions(+), 6 deletions(-) diff --git a/src/actions.js b/src/actions.js index 19eb1a5..a8d980e 100644 --- a/src/actions.js +++ b/src/actions.js @@ -1,11 +1,13 @@ import { graphql, formatQuery, + formatMutation, } from '@openimis/fe-core'; import { ACTION_TYPE } from './reducer'; +import { ERROR, REQUEST, SUCCESS } from './util/action-type'; const DEDUPLICATION_SUMMARY_FULL_PROJECTION = () => [ - 'rows {count, columnValues}', + 'rows {count, ids, columnValues}', ]; // eslint-disable-next-line import/prefer-default-export @@ -13,3 +15,37 @@ export function fetchDeduplicationSummary(params) { const payload = formatQuery('beneficiaryDeduplicationSummary', params, DEDUPLICATION_SUMMARY_FULL_PROJECTION()); return graphql(payload, ACTION_TYPE.GET_DEDUPLICATION_SUMMARY); } + +function formatDeduplicationTasksMutation(summary) { + if (!summary || !Array.isArray(summary)) { + return ''; + } + + const formattedSummary = summary.map((item) => { + const keyValuePairs = Object.entries(item) + .map(([key, value]) => `${key}: ${JSON.stringify(value)}`) + .join(', '); + + return `{ ${keyValuePairs} }`; + }); + + return `summary: [${formattedSummary.join(', ')}]`; +} +export function createDeduplicationTasks(summary, clientMutationLabel) { + const mutation = formatMutation( + 'createDeduplicationTasks', + formatDeduplicationTasksMutation(summary), + clientMutationLabel, + ); + const requestedDateTime = new Date(); + return graphql( + mutation.payload, + [REQUEST(ACTION_TYPE.MUTATION), SUCCESS(ACTION_TYPE.CREATE_DEDUPLICATION_TASKS), ERROR(ACTION_TYPE.MUTATION)], + { + actionType: ACTION_TYPE.CREATE_DEDUPLICATION_TASKS, + clientMutationId: mutation.clientMutationId, + clientMutationLabel, + requestedDateTime, + }, + ); +} diff --git a/src/components/dialogs/DeduplicationFieldSelectionDialog.js b/src/components/dialogs/DeduplicationFieldSelectionDialog.js index aedf531..e349f42 100644 --- a/src/components/dialogs/DeduplicationFieldSelectionDialog.js +++ b/src/components/dialogs/DeduplicationFieldSelectionDialog.js @@ -136,6 +136,7 @@ function DeduplicationFieldSelectionDialog({ benefitPlan={benefitPlan} handleClose={handleSummaryDialogClose} showSummaryDialog={showSummaryDialog} + setShowSummaryDialog={setShowSummaryDialog} selectedValues={selectedValues} setSelectedValues={setSelectedValues} /> diff --git a/src/components/dialogs/DeduplicationSummaryDialog.js b/src/components/dialogs/DeduplicationSummaryDialog.js index 2f60f52..8f2ab60 100644 --- a/src/components/dialogs/DeduplicationSummaryDialog.js +++ b/src/components/dialogs/DeduplicationSummaryDialog.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useState } from 'react'; import { injectIntl } from 'react-intl'; import Button from '@material-ui/core/Button'; import Dialog from '@material-ui/core/Dialog'; @@ -10,7 +10,7 @@ import { withTheme, withStyles } from '@material-ui/core/styles'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import DeduplicationSummaryTable from '../tables/DeduplicationSummaryTable'; -import { fetchDeduplicationSummary } from '../../actions'; +import { createDeduplicationTasks, fetchDeduplicationSummary } from '../../actions'; const styles = (theme) => ({ item: theme.paper.item, @@ -21,13 +21,23 @@ function DeduplicationSummaryDialog({ benefitPlan, handleClose, showSummaryDialog, + setShowSummaryDialog, selectedValues, + createDeduplicationTasks, }) { + const [summary, setSummary] = useState(); if (!benefitPlan) return null; const columns = selectedValues.map((value) => value.id); const columnParam = `columns: ${JSON.stringify(columns)}`; + const onDeduplicationTasksClick = () => { + if (summary) { + createDeduplicationTasks(summary, formatMessage(intl, 'deduplication', 'deduplicate.mutation.createTasks')); + } + setShowSummaryDialog(false); + }; + return (
+ + + + + + {headers.map((header, index) => ( + {header} + ))} + + + + {rows.map((row, rowIndex) => ( + + + handleCheckboxChange(rowIndex)} + /> + + {headers.map((header, headerIndex) => ( + handleCellClick(rowIndex, header, row[header])} + > + {row[header]} + + ))} + + ))} + +
+ +
+ ); +} + +export default BeneficiaryDuplicatesTable; diff --git a/src/components/tasks/DeduplicationResolutionTask.js b/src/components/tasks/DeduplicationResolutionTask.js index cf791c5..5c51bf6 100644 --- a/src/components/tasks/DeduplicationResolutionTask.js +++ b/src/components/tasks/DeduplicationResolutionTask.js @@ -1,23 +1,55 @@ import React from 'react'; +import { Typography, makeStyles } from '@material-ui/core'; +import BeneficiaryDuplicatesTable from '../BeneficiaryDuplicatesTable'; + +const useStyles = makeStyles((theme) => ({ + paper: theme.paper.paper, + title: theme.paper.title, +})); function BeneficiaryDeduplicationTaskDisplay({ - businessData, + businessData, setAdditionalData, }) { + const classes = useStyles(); + const beneficiaryUuids = (businessData?.ids || []).map((id) => id.uuid); + const beneficiaries = (businessData?.ids || []).map((id) => { + // eslint-disable-next-line camelcase + const { individual, json_ext, ...rest } = id; + return { + ...rest, + ...individual, + // eslint-disable-next-line camelcase + ...json_ext, + individual: individual.uuid, + }; + }); + + const headers = businessData?.headers || []; + const individualIndex = headers.indexOf('individual'); + + if (individualIndex !== -1) { + headers.splice(individualIndex, 1); + headers.unshift('individual'); + } + return (
-
- {JSON.stringify(businessData.column_values)} + + {JSON.stringify(businessData?.column_values)} {' '} , count: {' '} - {businessData.count} -
-
- headers -
+ {businessData?.count} +
- {businessData.ids.map((id) =>
{id}
)} + +
); @@ -26,7 +58,12 @@ function BeneficiaryDeduplicationTaskDisplay({ const DeduplicationResolutionTaskTableHeaders = () => []; const DeduplicationResolutionItemFormatters = () => [ - (businessData) => , + (businessData, jsonExt, formatterIndex, setAdditionalData) => ( + + ), ]; export { DeduplicationResolutionTaskTableHeaders, DeduplicationResolutionItemFormatters }; diff --git a/src/translations/en.json b/src/translations/en.json index 56c84be..a72010c 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -10,5 +10,6 @@ "deduplication.deduplicationSummaryTable.group": "Group", "deduplication.deduplicationSummaryTable.duplicates": "Duplicates", "deduplication.tasks.deduplication.title": "Benefit Plan Deduplication Task", - "deduplication.deduplicate.mutation.createTasks": "Deduplication tasks have been created." + "deduplication.deduplicate.mutation.createTasks": "Deduplication tasks have been created.", + "deduplication.BeneficiaryDuplicatesTable.checkbox.header": "Select all columns" } \ No newline at end of file From 53433c2f61b1f2d86efb7d568b17ba530b97a426 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 4 Apr 2024 00:49:47 +0200 Subject: [PATCH 15/17] CM-447: adjust frontend deduplication --- src/components/BeneficiaryDuplicatesTable.js | 81 +++++++++++++++++-- .../tasks/DeduplicationResolutionTask.js | 20 +++-- src/translations/en.json | 4 +- 3 files changed, 94 insertions(+), 11 deletions(-) diff --git a/src/components/BeneficiaryDuplicatesTable.js b/src/components/BeneficiaryDuplicatesTable.js index 789f9d4..ab59491 100644 --- a/src/components/BeneficiaryDuplicatesTable.js +++ b/src/components/BeneficiaryDuplicatesTable.js @@ -14,6 +14,8 @@ const useStyles = makeStyles((theme) => ({ tableHeader: theme.table.header, tableRow: theme.table.row, title: theme.paper.title, + tableDisabledRow: theme.table.disabledRow, + tableDisabledCell: theme.table.disabledCell, tableContainer: { overflow: 'auto', }, @@ -35,20 +37,30 @@ const useStyles = makeStyles((theme) => ({ })); function BeneficiaryDuplicatesTable({ - headers, rows, setAdditionalData, beneficiaryUuids, + headers, rows, setAdditionalData, completedData, }) { const classes = useStyles(); const [selectedCells, setSelectedCells] = useState([]); const [selectedRow, setSelectedRow] = useState(null); + const [dontMergeRows, setDontMergeRows] = useState([]); + const [fieldValues, setFieldValues] = useState({}); useEffect(() => { + const filteredIds = rows + .filter((row, index) => !dontMergeRows.includes(index)) + .map((row) => row.beneficiaryId); + const parsedFieldValues = selectedCells.reduce((acc, cell) => { + acc[cell.header] = cell.value ?? ''; + return acc; + }, {}); + setFieldValues(parsedFieldValues); const additionalData = ( - { values: selectedCells.map((cell) => ({ [cell.header]: cell.value })), beneficiaryIds: beneficiaryUuids } + { values: fieldValues, beneficiaryIds: filteredIds } ); // eslint-disable-next-line max-len const additionalDataString = `{\\"values\\": ${JSON.stringify(additionalData.values).replace(/"/g, '\\"')},\\"beneficiaryIds\\": ${JSON.stringify(additionalData.beneficiaryIds).replace(/"/g, '\\"')}}`; setAdditionalData(additionalDataString); - }, [selectedCells]); + }, [selectedCells, dontMergeRows]); const isCellSelected = (rowIndex, header) => selectedCells.some( (cell) => cell.rowIndex === rowIndex && cell.header === header, ); @@ -74,6 +86,10 @@ function BeneficiaryDuplicatesTable({ return; } + if (dontMergeRows.includes(rowIndex)) { + return; + } + const isCellSelectedInColumn = selectedCells.some((cell) => cell.header === header); const isCellClicked = isCellSelected(rowIndex, header); @@ -108,12 +124,41 @@ function BeneficiaryDuplicatesTable({ } }; + const handleMergeCheckboxChange = (rowIndex) => { + if (!dontMergeRows.includes(rowIndex)) { + clearRowSelection(rowIndex); + setDontMergeRows([...dontMergeRows, rowIndex]); + } else { + const index = dontMergeRows.indexOf(rowIndex); + if (index !== -1) { + const newDontMergeRows = [...dontMergeRows]; + newDontMergeRows.splice(index, 1); + setDontMergeRows(newDontMergeRows); + } + } + }; + + // eslint-disable-next-line max-len + const shouldHoverCell = (rowIndex, header) => !isCellSelected(rowIndex, header) && header !== 'individual' && !dontMergeRows.includes(rowIndex); + const shouldDisableCell = (rowIndex) => dontMergeRows.includes(rowIndex); + + useEffect(() => { + if (completedData) { + const numberOfRows = Array.from(Array(rows.length).keys()); + clearAllCellSelection(); + setDontMergeRows(numberOfRows); + } + }, [completedData]); + return (
+ + + @@ -128,19 +173,28 @@ function BeneficiaryDuplicatesTable({ key={rowIndex} className={classes.tableRow} > + + handleMergeCheckboxChange(rowIndex)} + disabled={completedData} + /> + handleCheckboxChange(rowIndex)} + disabled={shouldDisableCell(rowIndex)} /> {headers.map((header, headerIndex) => ( handleCellClick(rowIndex, header, row[header])} > {row[header]} @@ -148,6 +202,23 @@ function BeneficiaryDuplicatesTable({ ))} ))} + + + + + + {headers.map((header, headerIndex) => ( + + {Object.prototype.hasOwnProperty.call(fieldValues, header) ? fieldValues[header] : rows[0][header]} + + ))} +
diff --git a/src/components/tasks/DeduplicationResolutionTask.js b/src/components/tasks/DeduplicationResolutionTask.js index 5c51bf6..7b705d4 100644 --- a/src/components/tasks/DeduplicationResolutionTask.js +++ b/src/components/tasks/DeduplicationResolutionTask.js @@ -8,19 +8,26 @@ const useStyles = makeStyles((theme) => ({ })); function BeneficiaryDeduplicationTaskDisplay({ - businessData, setAdditionalData, + businessData, setAdditionalData, jsonExt, }) { + if (!businessData) return null; + const classes = useStyles(); - const beneficiaryUuids = (businessData?.ids || []).map((id) => id.uuid); + const completedData = jsonExt?.additional_resolve_data + ? Object.values(jsonExt.additional_resolve_data)[0].values + : null; const beneficiaries = (businessData?.ids || []).map((id) => { - // eslint-disable-next-line camelcase - const { individual, json_ext, ...rest } = id; + const { + // eslint-disable-next-line camelcase + individual, json_ext, uuid, ...rest + } = id; return { ...rest, ...individual, // eslint-disable-next-line camelcase ...json_ext, individual: individual.uuid, + beneficiaryId: uuid, }; }); @@ -32,6 +39,8 @@ function BeneficiaryDeduplicationTaskDisplay({ headers.unshift('individual'); } + beneficiaries.sort((a, b) => new Date(a.date_created) - new Date(b.date_created)); + return (
@@ -47,7 +56,7 @@ function BeneficiaryDeduplicationTaskDisplay({ headers={headers} rows={beneficiaries} setAdditionalData={setAdditionalData} - beneficiaryUuids={beneficiaryUuids} + completedData={completedData} />
@@ -62,6 +71,7 @@ const DeduplicationResolutionItemFormatters = () => [ ), ]; diff --git a/src/translations/en.json b/src/translations/en.json index a72010c..ab95256 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -11,5 +11,7 @@ "deduplication.deduplicationSummaryTable.duplicates": "Duplicates", "deduplication.tasks.deduplication.title": "Benefit Plan Deduplication Task", "deduplication.deduplicate.mutation.createTasks": "Deduplication tasks have been created.", - "deduplication.BeneficiaryDuplicatesTable.checkbox.header": "Select all columns" + "deduplication.BeneficiaryDuplicatesTable.checkbox.header": "Select all columns", + "deduplication.BeneficiaryDuplicatesTable.merge.header": "Don't merge", + "deduplication.BeneficiaryDuplicatesTable.output": "OUTPUT:" } \ No newline at end of file From cd339cf78834fdf02da691021e96c9ab00c4073e Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 4 Apr 2024 15:13:50 +0200 Subject: [PATCH 16/17] CM-447: last adjustments --- src/components/BeneficiaryDuplicatesTable.js | 42 +++++++++++++------- src/translations/en.json | 3 +- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/components/BeneficiaryDuplicatesTable.js b/src/components/BeneficiaryDuplicatesTable.js index ab59491..9354598 100644 --- a/src/components/BeneficiaryDuplicatesTable.js +++ b/src/components/BeneficiaryDuplicatesTable.js @@ -34,6 +34,9 @@ const useStyles = makeStyles((theme) => ({ deactivatedRow: { opacity: 0.5, }, + strikethrough: { + textDecoration: 'line-through', + }, })); function BeneficiaryDuplicatesTable({ @@ -49,14 +52,14 @@ function BeneficiaryDuplicatesTable({ const filteredIds = rows .filter((row, index) => !dontMergeRows.includes(index)) .map((row) => row.beneficiaryId); - const parsedFieldValues = selectedCells.reduce((acc, cell) => { - acc[cell.header] = cell.value ?? ''; - return acc; + const parsedFieldValues = selectedCells.reduce((accumulation, cell) => { + accumulation[cell.header] = cell.value ?? ''; + return accumulation; }, {}); - setFieldValues(parsedFieldValues); const additionalData = ( - { values: fieldValues, beneficiaryIds: filteredIds } + { values: parsedFieldValues, beneficiaryIds: filteredIds } ); + setFieldValues(parsedFieldValues); // eslint-disable-next-line max-len const additionalDataString = `{\\"values\\": ${JSON.stringify(additionalData.values).replace(/"/g, '\\"')},\\"beneficiaryIds\\": ${JSON.stringify(additionalData.beneficiaryIds).replace(/"/g, '\\"')}}`; setAdditionalData(additionalDataString); @@ -141,6 +144,10 @@ function BeneficiaryDuplicatesTable({ // eslint-disable-next-line max-len const shouldHoverCell = (rowIndex, header) => !isCellSelected(rowIndex, header) && header !== 'individual' && !dontMergeRows.includes(rowIndex); const shouldDisableCell = (rowIndex) => dontMergeRows.includes(rowIndex); + const shouldCrossText = (rowIndex) => rows[rowIndex]?.is_deleted; + const isDontMereChecked = (rowIndex) => ( + (dontMergeRows.includes(rowIndex) && !completedData) || (completedData && !rows[rowIndex]?.is_deleted) + ); useEffect(() => { if (completedData) { @@ -174,12 +181,16 @@ function BeneficiaryDuplicatesTable({ className={classes.tableRow} > - handleMergeCheckboxChange(rowIndex)} - disabled={completedData} - /> + {rowIndex + ? ( + handleMergeCheckboxChange(rowIndex)} + disabled={completedData} + /> + ) + : } ( handleCellClick(rowIndex, header, row[header])} > {row[header]} diff --git a/src/translations/en.json b/src/translations/en.json index ab95256..6fd7c12 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -13,5 +13,6 @@ "deduplication.deduplicate.mutation.createTasks": "Deduplication tasks have been created.", "deduplication.BeneficiaryDuplicatesTable.checkbox.header": "Select all columns", "deduplication.BeneficiaryDuplicatesTable.merge.header": "Don't merge", - "deduplication.BeneficiaryDuplicatesTable.output": "OUTPUT:" + "deduplication.BeneficiaryDuplicatesTable.output": "OUTPUT:", + "deduplication.BeneficiaryDuplicatesTable.oldest": "Oldest" } \ No newline at end of file From 7f6a633770627624e5372d9280f29d851bf0a440 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 4 Apr 2024 15:32:56 +0200 Subject: [PATCH 17/17] CM-447: remove selected row if celll clicked --- src/components/BeneficiaryDuplicatesTable.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/BeneficiaryDuplicatesTable.js b/src/components/BeneficiaryDuplicatesTable.js index 9354598..2809fa4 100644 --- a/src/components/BeneficiaryDuplicatesTable.js +++ b/src/components/BeneficiaryDuplicatesTable.js @@ -98,6 +98,7 @@ function BeneficiaryDuplicatesTable({ if (isCellClicked) { clearCellSelection(rowIndex, header); + setSelectedRow(null); return; }