diff --git a/.all-contributorsrc b/.all-contributorsrc
index d33cb394d..65fa59897 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -124,6 +124,15 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "SoumyadiptoPal",
+ "name": "Soumyadipto Pal",
+ "avatar_url": "https://avatars.githubusercontent.com/u/119007659?v=4",
+ "profile": "https://github.com/SoumyadiptoPal",
+ "contributions": [
+ "code"
+ ]
}
]
}
diff --git a/README.md b/README.md
index 4046d997f..a9cd0e20b 100644
--- a/README.md
+++ b/README.md
@@ -121,6 +121,7 @@ We would like to thank all our contributors and users for their support and feed
Edogbanya Emmanuel
🐛 |
pranav514
💻 |
Aria
💻 |
+ 
Soumyadipto Pal
💻 |
diff --git a/apps/OpenSign/Dockerfile b/apps/OpenSign/Dockerfile
index 4b07ff8cc..49067d236 100644
--- a/apps/OpenSign/Dockerfile
+++ b/apps/OpenSign/Dockerfile
@@ -14,8 +14,6 @@ RUN npm install
COPY apps/OpenSign/ .
COPY apps/OpenSign/.husky .
-RUN npm run build
-
# Make port 3000 available to the world outside this container
EXPOSE 3000
diff --git a/apps/OpenSign/src/components/AppendFormInForm.js b/apps/OpenSign/src/components/AppendFormInForm.js
index 31c8415dd..494936742 100644
--- a/apps/OpenSign/src/components/AppendFormInForm.js
+++ b/apps/OpenSign/src/components/AppendFormInForm.js
@@ -667,7 +667,15 @@ class AppendFormInForm extends Component {
form.setACL(new Parse.ACL(ACL));
}
form.save(RowData).then(
- () => {
+ (formd) => {
+ const parseData = JSON.parse(JSON.stringify(formd));
+ this.props.details({
+ value: parseData[this.props.valueKey],
+ label: parseData[this.props.displayKey]
+ });
+ if (this.props.closePopup) {
+ this.props.closePopup();
+ }
let filtered = {};
if (this.state.redirect_type === "clearData") {
if (
@@ -686,25 +694,21 @@ class AppendFormInForm extends Component {
} else {
RowData = {};
}
- this.setState(
- {
- formData: filtered,
- active: true,
- loading: false,
- toastColor: "#5cb85c",
- toastDescription: this.state.successMassage
- },
- () => {
- this.props.removeState();
- this.props.removeLevel2State();
- this.props.removeLevel3State();
- var x = document.getElementById("snackbar");
- x.className = "show";
- setTimeout(function () {
- x.className = x.className.replace("show", "");
- }, 2000);
- }
- );
+ this.setState({
+ formData: filtered,
+ active: true,
+ loading: false,
+ toastColor: "#5cb85c",
+ toastDescription: "Record inserted successfully."
+ });
+ // this.props.removeState();
+ // this.props.removeLevel2State();
+ // this.props.removeLevel3State();
+ // var x = document.getElementById("snackbar");
+ // x.className = "show";
+ // setTimeout(function () {
+ // x.className = x.className.replace("show", "");
+ // }, 2000);
},
(error) => {
this.setState({
diff --git a/apps/OpenSign/src/components/fields/MultiSelectField.js b/apps/OpenSign/src/components/fields/MultiSelectField.js
index 7ccba7c73..48aaef090 100644
--- a/apps/OpenSign/src/components/fields/MultiSelectField.js
+++ b/apps/OpenSign/src/components/fields/MultiSelectField.js
@@ -494,9 +494,9 @@ const MultiSelectField = (props) => {
const handleNewDetails = (data) => {
setState({ [`${props.name}_DD`]: [...state[`${props.name}_DD`], data] });
if (selected.length > 0) {
- setSelected([data]);
- } else {
setSelected([...selected, data]);
+ } else {
+ setSelected([data]);
}
};
if (props.schema.uiLayout === "MultiDropdownList") {
@@ -656,7 +656,7 @@ const MultiSelectField = (props) => {
right: 0,
bottom: 0,
backgroundColor: "rgba(255, 255, 255, 0.75)",
- zIndex: 10
+ zIndex: 50
}
}}
>
diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/routes/Login.js
index 53d361666..bada3d29d 100644
--- a/apps/OpenSign/src/routes/Login.js
+++ b/apps/OpenSign/src/routes/Login.js
@@ -125,7 +125,26 @@ function Login(props) {
) {
_currentRole = userRoles[1];
} else {
- _currentRole = userRoles[0];
+ const rolesfiltered = userRoles.filter(
+ (x) => x !== "contracts_Guest"
+ );
+ if (rolesfiltered.length > 0) {
+ _currentRole = rolesfiltered[0];
+ } else {
+ setThirdpartyLoader(false);
+ setState({
+ ...state,
+ loading: false,
+ toastColor: "#d9534f",
+ toastDescription: `Does not have permissions to access this application.`
+ });
+ const x = document.getElementById("snackbar");
+ x.className = "show";
+ setTimeout(function () {
+ x.className = x.className.replace("show", "");
+ }, 2000);
+ }
+ // _currentRole = userRoles[0];
}
} else {
_currentRole = userRoles[0];
@@ -725,6 +744,7 @@ function Login(props) {
};
const GetLoginData = async () => {
+ setState({...state, loading: true})
try {
Parse.serverURL = localStorage.getItem("baseUrl");
Parse.initialize(localStorage.getItem("parseAppId"));
@@ -769,7 +789,26 @@ function Login(props) {
) {
_currentRole = userRoles[1];
} else {
- _currentRole = userRoles[0];
+ const rolesfiltered = userRoles.filter(
+ (x) => x !== "contracts_Guest"
+ );
+ if (rolesfiltered.length > 0) {
+ _currentRole = rolesfiltered[0];
+ } else {
+ setThirdpartyLoader(false);
+ setState({
+ ...state,
+ loading: false,
+ toastColor: "#d9534f",
+ toastDescription: `Does not have permissions to access this application.`
+ });
+ const x = document.getElementById("snackbar");
+ x.className = "show";
+ setTimeout(function () {
+ x.className = x.className.replace("show", "");
+ }, 2000);
+ }
+ // _currentRole = userRoles[0];
}
} else {
_currentRole = userRoles[0];
diff --git a/microfrontends/SignDocuments/src/css/signature.css b/microfrontends/SignDocuments/src/css/signature.css
index dad6e2673..19ebe71b0 100644
--- a/microfrontends/SignDocuments/src/css/signature.css
+++ b/microfrontends/SignDocuments/src/css/signature.css
@@ -237,6 +237,7 @@
background: #08bc66;
border: none !important;
color: white !important;
+ text-decoration: none !important;
}
.certificateBtn:hover {