Skip to content

Commit

Permalink
Microplan v1 UI Changes merging to master under health folder along w…
Browse files Browse the repository at this point in the history
…ith Campaign changes (#961)

* HLM-5154 removing chloropleth part

* Update Mapping.js

* updated project type

* HLM-5208 basic chloropleth setup

* HLM-5208  review changes and bug HLM-5866

* HLM-5208 review changes

* work in progress

* work in progress

* work in progress

* work in progress

* HLM-5156 filter lyaer in map

* HLM-5156 adding filter layer is mapping section HLM-5880 bug

* HLM-5156 updating UIconfigurations

* HLM-5891 microplan success screen bug

* Update UICustomizations.js

* HLM-5891 updating how data is processed and then stored in ssn storage

* reverting the digit svg version

* HLM-5156 adding isFilterPropertyOfMapSection to ajv

* HLM-5156 minor fixes

* changing shapefile content name validation

* HLM-5156 review changes

* HLM-5156 review changes

* HLM-5208 adding choropleth UI

* Updated schema property name

* downgrading digit ui react components

* HLM-5926 UI audit changes and enabling upload of multi sheet data

* HLM-5926 upgrading css pkg

* HLM-5926 changeing id to name in success screen

* HLM-5926 review changes

* Update package.json

* HLM-5926 review chagnes

* HLM-5926 upgrading microplan css pkg version

* HLM-5926 dropdowns to digit dropdowns

* HLM-5926 adding base color changes

* HLM-5926 increasing css pkg version

* HLM-5926 adding review changes

* removing debugger

* Update updateSessionUtils.js

* work in progress

* HLM-5926 api integration for active status

* HLM-5926 review changes

* increasing microplan css version

* adding additional prop load check in navigator

* HLM-5926 download translated microlan

* HLM-5926 removing duplicate children in mapping

* HLM-5926 adding review changes

* HLM-5926 review changes

* demo fixes

* demo changes

* HLM-5926 demo changes for preview and modal buttons

* HLM-5926 campaign date change

* HLM-5926 review changes

* HLM-5926 overriding login page css

* Update microplanning.scss

* HLM-6011 campaign date

* Update UICustomizations.js

* HLM-5926 resource mapping errors

* HLM-6019 adding show error in upload preview screen  and navigation restrictions

* HLM-6019 review changes

* Update JsonPreviewInExcelForm.js

* HLM-6019 download template

* HLM-6019 enabling download

* HLM-6019 review changes

* HLM-6019 review change

* Update Upload.js

* HLM-6019 reverted digit core

* HLM-5125 download template

* HLM-5925 adding review changes

* Update RuleEngine.js

* HLM-6172 template download and save and highlight the data after data is adjusted in microplan generation page.

* HLM-6172 adding review changes

* HLM-6172 Notice and instruction page needs to be hidden or should contian sample data and Check localisation for geojson and shape file Mapping

* HLM-5172  Column heading has to be freezed

* HLM-6172 review changes

* HLM-6172 debuggers

* HLM-6172 review changes

* HLM-5925 help feature bug fixes

* HLM-6172 downlgrading ui core version

* HLM-6172 campaigntype automation

* HLM-6172 Tool tip of formula configuration and  Hover over the errors in preview screen add localization and template download changes

* HLM-6172 avj fixes

* adding review changes

* HLM-6172 removing MDMS data

* work in progress

* HLM-6172 removing mdms data and  removing heirarchy mapping from facilities

* field length validation for geojson and shape files

* HLM-6172 reinstating setting upload error

* adding review changes

* Update Upload.js

* error correction for handle excel

* work in progress

* work in progress

* work in progress

* work in progress

* work in progress

* Update Upload.js

* work in progress

* work in progress

* Update Upload.js

* Update Upload.js

* Update Upload.js

* Update Upload.js

* work in progress

* work in progress

* HLM-6172 adding audit changes

* HLM-6172 adding required data for smc and demo review comment changes

* cleaning up code

* HLM-6172 removing mdms files and adding review changes

* HLM-6172 removing unnecessary dependancy and activating process hold with api throws an error

* HLM-6172 adding review changes

* Update index.js

* Update excelValidations.js

* HLM-6172  Navigation via fixed keyboard for Popups is not working

* HLM-6172 adding review changes

* HLM-6172 adding microplan name validation

* HLM-6172 adding review changes

* HLM-6172 adding review changes

* Update CommonComponents.js

* Update updateSessionUtils.js

* improving error handling

* HLM-6172 changed how microplan nameing error is shown, rule logic correction

* HLM-6172 adding naming convention info box

* upgraded microplan css version

* HLM-6172 adding select all corrections

* HLM-6172 adding campaign end date restriction, and other required changes

* HLM-6172 modal focus changes

* HLM-6172 example data filling

* HLM-6172 review changes

* Update processHierarchyAndData.js

* HLM-6172 mapping page correction and api call data corrections

* adding review changes

* HLM-6172 adding required changes for facility data upload and removing prerequisites from upload data section

* HLM-6172 adding review changes

* Update Upload.js

* Update Upload.js

* Update Upload.js

* HLM-6172 allowing user to enter 0.somehing in hypothesis section

* HLM-6172 adding upload propogation restriction on error

* Update Upload.js

* HLM-6172 changing the upload page navigation

* Update MicroplanDetails.js

* HLM-6172 shifting toast to create microplan

* work in progress

* work in progress

* upgrade microplan css version

* work in progress

* work in progress

* work in progress

* work in progress

* HLM-6234 HLM-6235 HLM-6237 HLM-6238 HLM-6239 HLM-6240

* adding review changes and protection of cell in downloaded templates

* increasing microplan css pkg version

* removing MDMS data and adding review changes

* adding review changes

* adding review changes

* hiding unique identifier column

* HLM-6172 adding upload guidelines

* Update Upload.js

* micro css changes and comfirm mcroplan pop up

* Update MicroplanPreview.js

* HLM-6172 updating operation to match api changes

* updating operation to match api changes

* removing unused code and updating readme file

* adding UploadGuidelines

* Update index.js

* HLM-6258 , HLM-6251 adding readme for templates and enabling user to uplaod comma separated boundary code in facility

* updating microplan scss version

* reducing complexities of various funcitons

* reducing complexities of various funcitons

* Update MicroplanPreview.js

* adding review changes and removing MDMS data

* adding review changes

* adding style for generated microplan

* Update coreOverride.scss

* overriding microplan success header class and updates shape file handling

* HLM-6298 adding active inactive field in template

* adding review chagnes

* reducing function complicity

* adding review changes

* Update CreateMicroplan.js

* updating microplan css pkg

* translating error column header for styling

* geojson shapefile active inactive changes

* updating css pkg version

* adding review changes

* Update index.js

* moving microplaning from micro-ui/ to health/micro-ui/

* Update CODEOWNERS

* shifting health service frontend data to digit fronend

* removed template

---------

Co-authored-by: Nipun Arora <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
  • Loading branch information
3 people authored Jun 26, 2024
1 parent a42bd28 commit c29df69
Show file tree
Hide file tree
Showing 85 changed files with 13,899 additions and 115 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publishAllPackages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Node.js Publish Health UI Packages

on:
push:
branches: [ 'develop','campaign' ]
branches: [ 'develop','campaign' ,'microplan']
paths:
- 'health/micro-ui/web/micro-ui-internals/**'

Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"editor.inlineSuggest.showToolbar": "onHover"
"editor.inlineSuggest.showToolbar": "always"
}
3 changes: 2 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* @egovernments/core-ui-reviewers
- @egovernments/core-ui-reviewers

29 changes: 10 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@


# DIGIT UI

A React App built on top of DIGIT UI Core.
Expand All @@ -12,17 +11,14 @@ DIGIT (Digital Infrastructure for Governance, Impact & Transformation) is India'

DIGIT platform is microservices based API platform enabling quick rebundling of services as per specific needs. This is a repo that lays down the core platform on top of which other mission services depend.


# DIGIT UI

# DIGIT UI

This repository contains source code for web implementation of the new Digit UI modules with dependencies and libraries.

Workbench module is used to Manage the master data (MDMS V2 Service) used across the DIGIT Services / Applications

It is also used to manage the Localisation data present in the system (Localisation service)


## Run Locally

Clone the project
Expand All @@ -32,6 +28,7 @@ Clone the project
```

Go to the Sub directory to run UI

```bash
cd into micro-ui/web/micro-ui-internals
```
Expand All @@ -43,6 +40,7 @@ Install dependencies
```

Add .env file

```bash
micro-ui/web/micro-ui-internals/example/.env
```
Expand All @@ -53,26 +51,25 @@ Start the server
yarn start
```


## Environment Variables

To run this project, you will need to add the following environment variables to your .env file

`REACT_APP_PROXY_API` :: `{{server url}}`
`REACT_APP_PROXY_API` :: `{{server url}}`

`REACT_APP_GLOBAL` :: `{{server url}}`
`REACT_APP_GLOBAL` :: `{{server url}}`

`REACT_APP_PROXY_ASSETS` :: `{{server url}}`
`REACT_APP_PROXY_ASSETS` :: `{{server url}}`

`REACT_APP_USER_TYPE` :: `{{EMPLOYEE||CITIZEN}}`
`REACT_APP_USER_TYPE` :: `{{EMPLOYEE||CITIZEN}}`

`SKIP_PREFLIGHT_CHECK` :: `true`

[sample .env file](https://github.com/egovernments/Digit-Core/blob/workbench/frontend/micro-ui/web/micro-ui-internals/example/.env-unifieddev)

## Tech Stack

**Libraries:**
**Libraries:**

[React](https://react.dev/)

Expand All @@ -88,22 +85,18 @@ To run this project, you will need to add the following environment variables to

[MIT](https://choosealicense.com/licenses/mit/)


## Author

- [@jagankumar-egov](https://www.github.com/jagankumar-egov)


## Documentation

[Documentation](https://https://core.digit.org/guides/developer-guide/ui-developer-guide/digit-ui)


## Support

For support, add the issues in https://github.com/egovernments/DIGIT-core/issues.


## Modules

1. Core
Expand All @@ -115,18 +108,18 @@ For support, add the issues in https://github.com/egovernments/DIGIT-core/issues

## Starting with Digit-UI App (Impelmentation Teams) - MICRO-UI


Go to the Sub directory to run UI

```bash
cd into micro-ui/web
```

```bash
yarn install
```

Add .env file

```bash
micro-ui/web/.env
```
Expand All @@ -137,6 +130,4 @@ Start the server
yarn start
```


![Logo](https://s3.ap-south-1.amazonaws.com/works-dev-asset/mseva-white-logo.png)

2 changes: 1 addition & 1 deletion health/micro-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "workbench-ui",
"version": "1.0.0"
"version": "0.1.0"
}
Empty file modified health/micro-ui/web/install-deps.sh
100755 → 100644
Empty file.
3 changes: 2 additions & 1 deletion health/micro-ui/web/micro-ui-internals/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@egovernments/digit-ui-react-components": "1.8.2-beta.6",
"@egovernments/digit-ui-module-hcmworkbench":"0.0.38",
"@egovernments/digit-ui-module-campaign-manager": "0.0.1",
"@egovernments/digit-ui-module-hcmmicroplanning": "0.0.1",
"http-proxy-middleware": "^1.0.5",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand All @@ -36,4 +37,4 @@
"last 1 safari version"
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />

<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

Expand Down
Loading

0 comments on commit c29df69

Please sign in to comment.