Skip to content

Commit cad8089

Browse files
author
Benjamin Perez
committed
License modal improvements
- Removed stats call - Avoid show modal on every load as initially planned Signed-off-by: Benjamin Perez <[email protected]>
1 parent 2595faf commit cad8089

File tree

4 files changed

+48
-365
lines changed

4 files changed

+48
-365
lines changed

web-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"local-storage-fallback": "^4.1.3",
1313
"lodash": "^4.17.21",
1414
"luxon": "^3.6.1",
15-
"mds": "https://github.com/minio/mds.git#v1.1.4",
15+
"mds": "https://github.com/minio/mds.git#v1.1.5",
1616
"react": "^18.3.1",
1717
"react-copy-to-clipboard": "^5.1.0",
1818
"react-dom": "^18.3.1",

web-app/src/screens/Console/License/LicenseConsentModal.tsx

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,14 @@ const LicenseConsentModal = () => {
3333

3434
const [displayForceAcknowledge, setDisplayForceAcknowledge] =
3535
useState<boolean>(false);
36-
const [acknowledgeDisabled, setAcknowledgeDisabled] =
37-
useState<boolean>(false);
3836

3937
const licenseAcknowledged = useSelector(
4038
(state: AppState) => state.system.licenseAcknowledged,
4139
);
4240

4341
const recordAgplConsent = () => {
44-
setAcknowledgeDisabled(true);
45-
46-
fetch("https://dl.min.io/server/minio/agplv3-ack", {
47-
mode: "no-cors",
48-
})
49-
.then(() => {
50-
setLicenseConsent(); //to Local storage.
51-
dispatch(setAcknowledgeLicense(true));
52-
setAcknowledgeDisabled(false);
53-
})
54-
.catch(() => {
55-
setAcknowledgeDisabled(false);
56-
console.error("Error while trying to Acknowledge the license");
57-
dispatch(setAcknowledgeLicense(true));
58-
});
42+
setLicenseConsent(); //to Local storage.
43+
dispatch(setAcknowledgeLicense(true));
5944
};
6045

6146
if (licenseAcknowledged) {
@@ -190,7 +175,6 @@ const LicenseConsentModal = () => {
190175
variant="callAction"
191176
onClick={recordAgplConsent}
192177
label={"Acknowledge"}
193-
disabled={acknowledgeDisabled}
194178
/>
195179
</Box>
196180
</Box>

web-app/src/systemSlice.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { AppState } from "./store";
2020
import { SubnetInfo } from "./screens/Console/License/types";
2121
import { isDarkModeOn } from "./utils/stylesUtils";
2222
import { addBucketAsync } from "./screens/Console/Buckets/ListBuckets/AddBucket/addBucketThunks";
23+
import { getLicenseConsent } from "./screens/Console/License/utils";
2324

2425
// determine whether we have the sidebar state stored on localstorage
2526
const initSideBarOpen = localStorage.getItem("sidebarOpen")
@@ -85,7 +86,7 @@ const initialState: SystemState = {
8586
darkMode: isDarkModeOn(),
8687
filterBucketList: "",
8788
loadBucketsListing: true,
88-
licenseAcknowledged: false,
89+
licenseAcknowledged: getLicenseConsent(),
8990
};
9091

9192
const systemSlice = createSlice({

0 commit comments

Comments
 (0)