Merge pull request #83 from openimis/release/26.04

MERGING release/26.04 into develop

Author: ajinkyagadewar

.github/workflows/npm-publish.yml

@@ -1,63 +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
+name: Publish Node.js Package
 
 on:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      node_version:
+        description: 'Node version to use'
+        required: true
+        default: '20'
+      registry_url:
+        description: 'NPM registry URL'
+        required: true
+        default: 'https://registry.npmjs.org/'
+      scope:
+        description: 'Scope for npm package'
+        required: false
+        default: 'openimis'
+      access:
+        description: 'Access level for npm package'
+        required: false
+        default: 'public'
+      tag:
+        required: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: olegtarasov/get-tag@v2.1
-        id: tagName
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 16
-      - name: update the version with TAG
-        run: echo $(jq --arg a "$GIT_TAG_NAME" '.version = ($a)' package.json) >  package.json
-      - run: yarn install
-      - run: yarn build
-      
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: olegtarasov/get-tag@v2.1
-        id: tagName
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 16
-          registry-url: https://registry.npmjs.org/
-          scope: openimis
-      - name: update the version with TAG
-        run: echo $(jq --arg a "$GIT_TAG_NAME" '.version = ($a)' package.json) >  package.json
-      - 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: olegtarasov/get-tag@v2.1
-        id: tagName
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 16
-          registry-url: https://npm.pkg.github.com/
-      - name: update the version with TAG
-        run: echo $(jq --arg a "$GIT_TAG_NAME" '.version = ($a)' package.json) >  package.json
-      - run: yarn install
-      - run: yarn build    
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+  call-npm-publish-workflow:
+    uses: openimis/openimis-fe_js/.github/workflows/module-npmpublish.yml@develop
+    with:
+      registry_url: 'https://registry.npmjs.org/'
+      node_version: ${{ github.event.inputs.node_version || '20' }}
+      access: ${{ github.event.inputs.access || 'public' }}
+      scope: ${{ github.event.inputs.scope || 'openimis' }}
+      tag: ${{ github.event.inputs.tag }}
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+  call-gpr-publish-workflow:
+    uses: openimis/openimis-fe_js/.github/workflows/module-npmpublish.yml@develop
+    with:
+      registry_url: 'https://npm.pkg.github.com/'
+      node_version: ${{ github.event.inputs.node_version || '20' }}
+      access: ${{ github.event.inputs.access || 'public' }}
+      scope: ${{ github.event.inputs.scope || 'openimis' }}
+      tag: ${{ github.event.inputs.tag }}
+    secrets:
+      NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/actions.js

@@ -15,7 +15,6 @@ const uuidRegex =
 const CONTRACT_FULL_PROJECTION = (modulesManager) => [
   "id",
   "code",
-  "amount",
   "amountNotified",
   "amountRectified",
   "amountDue",

src/components/ContractSearcher.js

@@ -99,7 +99,7 @@ class ContractSearcher extends Component {
         const result = [
             "contract.code",
             "contract.state",
-            "contract.amount",
+            "contract.amountDue",
             "contract.datePaymentDue",
             "contract.dateValidFrom",
             "contract.dateValidTo",
@@ -133,7 +133,7 @@ class ContractSearcher extends Component {
                     value={contract.state}
                     readOnly />
                 : "",
-            contract => !!contract.amount ? contract.amount : "",
+            contract => !!contract.amountDue ? contract.amountDue : "",
             contract => !!contract.datePaymentDue
                 ? formatDateFromISO(modulesManager, intl, contract.datePaymentDue)
                 : "",