diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 4870d614..f19b0f2c 100755 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -3588,10 +3588,6 @@ class AppBase: if "the JSON object must be" in errorstring: self.logger.info("[ERROR] Something is wrong with the input for this function. Are lists and JSON data handled parsed properly (0)? the JSON object must be in...") - #try: - # e = json.loads(f"{e}") - #except: - # e = f"{e}" newres = json.dumps({ "success": False, diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index f698ae30..8cfa6fa5 100755 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -1,7 +1,6 @@ module shuffle-shared - -// replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared +//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared go 1.19 @@ -20,7 +19,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/h2non/filetype v1.1.3 github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.4.55 + github.com/shuffle/shuffle-shared v0.4.57 golang.org/x/crypto v0.9.0 google.golang.org/api v0.125.0 google.golang.org/appengine v1.6.7 diff --git a/backend/go-app/go.sum b/backend/go-app/go.sum index ab2eafe3..db29bc99 100644 --- a/backend/go-app/go.sum +++ b/backend/go-app/go.sum @@ -391,6 +391,8 @@ github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shuffle/shuffle-shared v0.4.56 h1:Z29GZB/eipt2aA4i+6heO1V2mrUmHPdw4QN4X4b1HdU= +github.com/shuffle/shuffle-shared v0.4.56/go.mod h1:X613gbo0dT3fnYvXDRwjQZyLC+T49T2nSQOrCV5QMlI= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= diff --git a/frontend/src/components/CacheView.jsx b/frontend/src/components/CacheView.jsx index 64f071f7..83bb0608 100644 --- a/frontend/src/components/CacheView.jsx +++ b/frontend/src/components/CacheView.jsx @@ -18,7 +18,6 @@ import { DialogTitle, DialogActions, } from "@mui/material"; -//import { useAlert import { Edit as EditIcon, @@ -74,7 +73,7 @@ const CacheView = (props) => { const [dataValue, setDataValue] = React.useState({}); const [editCache, setEditCache] = React.useState(false); const [show, setShow] = useState({}); - //const alert = useAlert(); + useEffect(() => { listOrgCache(orgId); console.log("orgid", orgId); diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx index 80cb6d28..5958b2fc 100755 --- a/frontend/src/views/LoginPage.jsx +++ b/frontend/src/views/LoginPage.jsx @@ -339,7 +339,7 @@ const LoginDialog = (props) => { variant="body2" style={{ marginBottom: 20, color: "white" }} > - 2. Disable memory swap on the host + 2. Disable memory swap on the host:

sudo swapoff -a @@ -348,10 +348,10 @@ const LoginDialog = (props) => { variant="body2" style={{ marginBottom: 20, color: "white" }} > - 3. Restart docker-compose: + 3. Restart the database:

- sudo docker-compose restart + sudo docker restart shuffle-opensearch