fixes (#19)

* OP-824: Fixed locations dry run * OP-898: Add confirmation popup to XML upload * OP-898: Remove unused variable
openimis · Dec 15, 2022 · 5f1e435 · 5f1e435
1 parent 5426ad5
commit 5f1e435
Show file tree

Hide file tree

Showing 6 changed files with 404 additions and 71 deletions.
diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
@@ -5,29 +5,38 @@ name: Node.js Package
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - uses: olegtarasov/[email protected]
+        id: tagName
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
           node-version: 12
+      - 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: yarn build
+
 
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
     steps:
+      - uses: olegtarasov/[email protected]
+        id: tagName
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
           node-version: 12
           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
@@ -38,11 +47,15 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
+      - uses: olegtarasov/[email protected]
+        id: tagName
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
           node-version: 12
           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

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openimis/fe-tools",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "license": "AGPL-3.0-only",
   "description": "openIMIS Frontend Tools reference module",
   "repository": "openimis/openimis-fe-tools_js",
@@ -12,12 +12,12 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "start": "rollup -c -w"
+    "start": "rollup -c -w",
+    "prepare":"npm run build"
   },
   "peerDependency": {
     "react-intl": "^5.8.1",
-    "react": "^17.0.2",
-    "react-router-dom": "^5.2.0"
+    "react": "^17.0.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
@@ -35,12 +35,8 @@
     "prop-types": "^15.7.2",
     "clsx": "^1.1.1",
     "rollup": "^2.10.0",
-    "@material-ui/core": "^4.9.14",
-    "@material-ui/icons": "^4.9.1",
-    "@openimis/fe-core": "^1.4.0-rc3",
     "moment": "^2.25.3",
-    "react-autosuggest": "^10.0.2",
-    "react-router-dom": "^5.2.0"
+    "react-autosuggest": "^10.0.2"
   },
   "files": [
     "dist"

diff --git a/src/components/ToolsMainMenu.js b/src/components/ToolsMainMenu.js
@@ -1,9 +1,9 @@
-import { Ballot, ImportExport, Settings } from "@material-ui/icons";
+import {Ballot, ImportExport, SaveAlt, Settings} from "@material-ui/icons";
 import { formatMessage, MainMenuContribution, withModulesManager } from "@openimis/fe-core";
 import React, { Component } from "react";
 import { injectIntl } from "react-intl";
 import { connect } from "react-redux";
-import { RIGHT_REGISTERS, RIGHT_REPORTS } from "../constants";
+import { RIGHT_REGISTERS, RIGHT_REPORTS, RIGHT_EXTRACTS } from "../constants";
 
 class ToolsMainMenu extends Component {
   enablers = (enablers) => {
@@ -37,11 +37,11 @@ class ToolsMainMenu extends Component {
     //   )
     // }
     // Extracts page is not implemented in the modular version yet. As it's not used as of now.
-    // if (this.enablers(RIGHT_EXTRACTS)) {
-    //   entries.push(
-    //     { text: formatMessage(this.props.intl, "tools", "menu.extracts"), icon: <SaveAlt />, route: "/tools/extracts" },
-    //   )
-    // }
+    if (this.enablers(RIGHT_EXTRACTS)) {
+      entries.push(
+        { text: formatMessage(this.props.intl, "tools", "menu.extracts"), icon: <SaveAlt />, route: "/tools/extracts" },
+      )
+    }
     if (this.enablers(RIGHT_REPORTS)) {
       entries.push({
         text: formatMessage(this.props.intl, "tools", "menu.reports"),