Skip to content

Commit

Permalink
RAIN-6975::Security fixes in Documents && Micro-UI Versions updated f…
Browse files Browse the repository at this point in the history
…or 2.7 (#2907)

* RAIN-6975::Security fixes in Documents

* RAIN-6975 ::  Micro-UI Versions updated for 2.7 to 1.5.1 (#2906)

* updated package.json

* Build directly from npm changes added

* RAIN-7003 workflow file store api changes to avoid multiple calls (#2903)

* Updated to last version

* RAIN-6975::Security fixes in Documents

* Update Dockerfile

* Updated all package for 2.7 release final

* Revert "Update Dockerfile"

This reverts commit a4c450381f782b6f416d2a7506ae5cb36fb4a355.

Co-authored-by: vamshikrishnakole-wtt-egov <[email protected]>
Co-authored-by: RamkrishnaEgovt <[email protected]>

* Update package.json

Co-authored-by: RamkrishnaEgovt <[email protected]>
Co-authored-by: vamshikrishnakole-wtt-egov <[email protected]>
  • Loading branch information
3 people authored and gajendran.c committed May 20, 2022
1 parent 7706954 commit 8b38619
Show file tree
Hide file tree
Showing 26 changed files with 73 additions and 94 deletions.
2 changes: 1 addition & 1 deletion frontend/micro-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "digit-ui",
"version": "1.5.0"
}
}
5 changes: 2 additions & 3 deletions frontend/micro-ui/web/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#FROM egovio/alpine-node-builder-14:yarn AS build
FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build
FROM egovio/alpine-node-builder-14:yarn AS build
# FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build
RUN apk update && apk upgrade
RUN apk add --no-cache git>2.30.0
ARG WORK_DIR
Expand All @@ -12,7 +12,6 @@ RUN ls -lah
#RUN node web/envs.js
RUN cd web/ \
&& node envs.js \
&& ./install-deps.sh \
&& yarn install \
&& yarn build

Expand Down
16 changes: 0 additions & 16 deletions frontend/micro-ui/web/micro-ui-internals/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,6 @@
"start": "react-scripts start"
},
"devDependencies": {
"@egovernments/digit-ui-libraries":"1.5.0-beta.26",
"@egovernments/digit-ui-module-common":"1.5.0-beta.26",
"@egovernments/digit-ui-module-core":"1.5.0-beta.26",
"@egovernments/digit-ui-module-commonpt":"1.5.0-beta.26",
"@egovernments/digit-ui-module-engagement":"1.5.0-beta.26",
"@egovernments/digit-ui-module-dss":"1.5.0-beta.26",
"@egovernments/digit-ui-module-fsm":"1.5.0-beta.26",
"@egovernments/digit-ui-module-hrms":"1.5.0-beta.26",
"@egovernments/digit-ui-module-mcollect":"1.5.0-beta.26",
"@egovernments/digit-ui-module-obps":"1.5.0-beta.26",
"@egovernments/digit-ui-module-pgr":"1.5.0-beta.26",
"@egovernments/digit-ui-module-pt":"1.5.0-beta.26",
"@egovernments/digit-ui-module-receipts":"1.5.0-beta.26",
"@egovernments/digit-ui-module-tl":"1.5.0-beta.26",
"@egovernments/digit-ui-module-noc":"1.5.0-beta.26",
"@egovernments/digit-ui-react-components":"1.5.0-beta.26",
"http-proxy-middleware": "^1.0.5",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion frontend/micro-ui/web/micro-ui-internals/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "egovernments",
"version": "1.5.0",
"version": "1.5.1",
"main": "index.js",
"workspaces": [
"example",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-css",
"version": "1.5.0-beta.6",
"version": "1.5.1",
"license": "MIT",
"main": "dist/index.css",
"engines": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-libraries",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"main": "dist/index.js",
"module": "dist/index.modern.js",
"source": "src/index.js",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-common",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit Common Payment Module",
"main": "dist/index.js",
Expand All @@ -15,8 +15,8 @@
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-commonpt",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit PT Light weight Module",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-core",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit App Core Module contains all core components",
"main": "dist/index.js",
Expand All @@ -15,8 +15,8 @@
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-dss",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit Dashboard Module",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-date-range": "1.3.0",
"react-dom": "17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-engagement",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit App Core Enagagement Module contains Notification survey documents",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const DocumentDesktopInbox = ({ isLoading, data, t, onSearch, title, iconName, l
},
{
Header: t('CE_TABLE_DOCUMENT_LINK'),
accessor: (row) => getDocumentCell(row?.name, row.filestoreId, row.documentLink, t)
accessor: (row) => getDocumentCell(row?.name, row.filestoreId, row.documentLink || "", t)
},
{
Header: t('CE_TABLE_DOCUMENT_POSTED_BY'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ const DocumentDetails = ({ location, match, history, }) => {
<div className="documentDetails_row_items"><p className="documentDetails_title">{`${t('DOCUMENT_NAME')}:`}</p> <p>{details?.name}</p> </div>
<div className="documentDetails_row_items"><p className="documentDetails_title">{`${t('DOCUMENT_CATEGORY')}:`}</p> <p>{t(details?.category)}</p> </div>
<div className="documentDetails_row_items"><p className="documentDetails_title">{`${t('DCOUMENT_DESCRIPTION')}:`}</p> <p className="documentDetails__description">{details?.description?.length ? details?.description : 'NA'}</p> </div>
<div className="documentDetails_row_items"><p className="documentDetails_title">{`${t('ES_COMMON_LINK_LABEL')}:`}</p>
{/* <div className="documentDetails_row_items"><p className="documentDetails_title">{`${t('ES_COMMON_LINK_LABEL')}:`}</p>
{details?.documentLink ? <LinkButton
label={
<div className="link" onClick={() => openDocumentLink(details?.documentLink, details?.name)}>
<p>{t(`CE_DOCUMENT_OPEN_LINK`)}</p>
</div>
}
/> : 'NA'}
</div>
</div> */}
{details?.filestoreId ? <div className="documentDetails_pdf">
<span className="documentDetails_subheader">{`${t('Document')}`}</span>
<div style={{ width: '100px' }} onClick={() => openUploadedDocument(details?.filestoreId, details?.name)}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const EngagementDocUploadDocument = ({ userType, t, onSelect, setValue, config,
</div>
</LabelFieldPair>

<LabelFieldPair style={{ margin: "25px" }}>
{/* <LabelFieldPair style={{ margin: "25px" }}>
<CardLabel></CardLabel>
<div style={{ textAlign: "center" }} className="field links-wrapper">
<span style={{ color: "#505a5f", fontWeight: "bold" }} className="cell-text">
Expand All @@ -123,7 +123,7 @@ const EngagementDocUploadDocument = ({ userType, t, onSelect, setValue, config,
<div className="field">
<TextInput name={config.key + ".documentLink"} inputRef={register()} disable={urlDisabled} />
</div>
</LabelFieldPair>
</LabelFieldPair> */}
</React.Fragment>
);
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-fsm",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"main": "dist/index.js",
"description": "Digit FSM Module",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"microbundle-crl": "0.13.11",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-hrms",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"description": "Digit HRMS Module",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -15,8 +15,8 @@
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-mcollect",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit Misc Collections Module",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-noc",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"description": "Digit NOC Module",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand All @@ -18,8 +18,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-obps",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"description": "Digit OBPS Module",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand All @@ -18,8 +18,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-pgr",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit Complaints Module",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-pt",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit Property Tax Module",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-receipts",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"description": "Digit Receipts Module",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -15,8 +15,8 @@
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-tl",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"description": "Digit Tradelicence Module",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.0-beta.26",
"@egovernments/digit-ui-react-components": "1.5.0-beta.26",
"@egovernments/digit-ui-libraries": "1.5.1",
"@egovernments/digit-ui-react-components": "1.5.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-react-components",
"version": "1.5.0-beta.26",
"version": "1.5.1",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand Down
Loading

0 comments on commit 8b38619

Please sign in to comment.