From d63ee362dcd92f2f619baca7e0be96215a2f0485 Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Wed, 5 May 2021 19:05:08 +0000
Subject: [PATCH] Add contact button
Change-Id: Iadc44570526085bd98d45fa717a104593e341fa8
---
.../src/views/Blueprint/EditBlueprintPermissions.js | 2 +-
jams-react-client/src/views/Contacts/Contacts.js | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
index 4847d411..d5fb210c 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
@@ -210,7 +210,7 @@ export default function EditBlueprintPermissions(props) {
setProxyEnabled(policyData["proxyEnabled"]);
setProxyServer(policyData["proxyServer"]);
setDhtProxyListUrl();
- setAllowLookup(policyData["autoAnswer"]);
+ setAllowLookup(policyData["allowLookup"]);
policyData["defaultModerators"].split("/").forEach((id) => {
if(id !== "undefined" && id !== ""){
diff --git a/jams-react-client/src/views/Contacts/Contacts.js b/jams-react-client/src/views/Contacts/Contacts.js
index 6464f091..8124eaa7 100644
--- a/jams-react-client/src/views/Contacts/Contacts.js
+++ b/jams-react-client/src/views/Contacts/Contacts.js
@@ -72,6 +72,9 @@ const styles = {
loading: {
width: "100%",
},
+ actionButtons: {
+ height: "3em",
+ }
};
const useStyles = makeStyles(styles);
@@ -88,6 +91,7 @@ export default function Users(props) {
const [removedContact, setRemovedContact] = React.useState();
const [removedContactName, setRemovedContactName] = React.useState();
const [open, setOpen] = React.useState(false);
+ const [allowedToAdd, setAllowedToAdd] = React.useState(true);
const searchContacts = (value) => {
axios(
@@ -118,6 +122,8 @@ export default function Users(props) {
if (error.response.status === 401) {
auth.authenticated = false;
history.push("/");
+ }else if(error.response.status === 403){
+ setAllowedToAdd(false);
}
});
}
@@ -366,7 +372,8 @@ export default function Users(props) {
</Dialog>
<GridContainer>
<GridItem xs={12} sm={12} md={12}>
- {auth.hasAdminScope() && <Button
+ <div className={classes.actionButtons}>
+ {allowedToAdd && <Button
variant="contained"
color="primary"
href="#contained-buttons"
@@ -376,6 +383,7 @@ export default function Users(props) {
>
<AddCircleOutlineIcon /> {i18next.t("add_a_contact", "Add contact")}
</Button>}
+ </div>
<div className={classes.searchWrapper}>
<CustomInput
formControlProps={{
--
GitLab