License modal improvements

- Removed stats call
- Avoid show modal on every load as initially planned

Signed-off-by: Benjamin Perez <[email protected]>

Author: Benjamin Perez

.golangci.yml

@@ -39,6 +39,10 @@ linters:
     testifylint:
       disable:
         - go-require
+    revive:
+      rules:
+        - name: "var-naming"
+          disabled: true
   exclusions:
     generated: lax
     rules:

web-app/package.json

@@ -11,8 +11,8 @@
     "kbar": "^0.1.0-beta.46",
     "local-storage-fallback": "^4.1.3",
     "lodash": "^4.17.21",
-    "luxon": "^3.6.1",
-    "mds": "https://github.com/minio/mds.git#v1.1.4",
+    "luxon": "^3.7.1",
+    "mds": "https://github.com/minio/mds.git#v1.1.5",
     "react": "^18.3.1",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.3.1",
@@ -59,11 +59,11 @@
   "proxy": "http://localhost:9090/",
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/runtime": "^7.27.6",
+    "@babel/runtime": "^7.28.2",
     "@playwright/test": "^1.53.1",
     "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.18",
-    "@types/luxon": "^3.6.2",
+    "@types/lodash": "^4.17.20",
+    "@types/luxon": "^3.7.0",
     "@types/node": "20.17.47",
     "@types/react": "18.3.23",
     "@types/react-copy-to-clipboard": "^5.0.7",
@@ -77,10 +77,10 @@
     "@types/webpack-env": "^1.18.8",
     "babel-plugin-istanbul": "^6.1.1",
     "customize-cra": "^1.0.0",
-    "knip": "^5.61.2",
+    "knip": "^5.62.0",
     "minio": "^8.0.5",
     "nyc": "^15.1.0",
-    "prettier": "3.5.3",
+    "prettier": "3.6.2",
     "react-app-rewire-hot-loader": "^2.0.1",
     "react-app-rewired": "^2.2.1",
     "react-scripts": "5.0.1",
@@ -100,7 +100,8 @@
     "jspdf": "^3.0.0",
     "@babel/runtime": "^7.26.10",
     "prebuilt-install": "^2.1.3",
-    "tar-fs": "^2.1.3"
+    "tar-fs": "^2.1.3",
+    "form-data": "^4.0.4"
   },
   "main": "index.js",
   "packageManager": "[email protected]"

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

@@ -33,29 +33,14 @@ const LicenseConsentModal = () => {
 
   const [displayForceAcknowledge, setDisplayForceAcknowledge] =
     useState<boolean>(false);
-  const [acknowledgeDisabled, setAcknowledgeDisabled] =
-    useState<boolean>(false);
 
   const licenseAcknowledged = useSelector(
     (state: AppState) => state.system.licenseAcknowledged,
   );
 
   const recordAgplConsent = () => {
-    setAcknowledgeDisabled(true);
-
-    fetch("https://dl.min.io/server/minio/agplv3-ack", {
-      mode: "no-cors",
-    })
-      .then(() => {
-        setLicenseConsent(); //to Local storage.
-        dispatch(setAcknowledgeLicense(true));
-        setAcknowledgeDisabled(false);
-      })
-      .catch(() => {
-        setAcknowledgeDisabled(false);
-        console.error("Error while trying to Acknowledge the license");
-        dispatch(setAcknowledgeLicense(true));
-      });
+    setLicenseConsent(); //to Local storage.
+    dispatch(setAcknowledgeLicense(true));
   };
 
   if (licenseAcknowledged) {
@@ -172,25 +157,15 @@ const LicenseConsentModal = () => {
               marginTop: "19px",
               display: "flex",
               alignItems: "center",
-              justifyContent: "space-between",
+              justifyContent: "flex-end",
             }}
           >
-            <Box>
-              <a
-                href={"https://min.io/privacy-policy"}
-                target={"_blank"}
-                rel={"noreferrer"}
-              >
-                Privacy Policy
-              </a>
-            </Box>
             <Button
               id={"acknowledge-confirm"}
               type="button"
               variant="callAction"
               onClick={recordAgplConsent}
               label={"Acknowledge"}
-              disabled={acknowledgeDisabled}
             />
           </Box>
         </Box>

web-app/src/systemSlice.ts

@@ -20,6 +20,7 @@ import { AppState } from "./store";
 import { SubnetInfo } from "./screens/Console/License/types";
 import { isDarkModeOn } from "./utils/stylesUtils";
 import { addBucketAsync } from "./screens/Console/Buckets/ListBuckets/AddBucket/addBucketThunks";
+import { getLicenseConsent } from "./screens/Console/License/utils";
 
 // determine whether we have the sidebar state stored on localstorage
 const initSideBarOpen = localStorage.getItem("sidebarOpen")
@@ -85,7 +86,7 @@ const initialState: SystemState = {
   darkMode: isDarkModeOn(),
   filterBucketList: "",
   loadBucketsListing: true,
-  licenseAcknowledged: false,
+  licenseAcknowledged: getLicenseConsent(),
 };
 
 const systemSlice = createSlice({

web-app/tests/permissions-3/bucketDeleteAllVersions.ts

@@ -49,7 +49,6 @@ test
     );
     await t
       .useRole(roles.bucketReadWrite)
-      .click(acknowledgeButton)
       .typeText(elements.filterBuckets, "bucketdelete3")
       .click(testBucketBrowseButtonFor("bucketdelete3"))
       .click(

web-app/tests/permissions-3/bucketObjectTags.ts

@@ -41,7 +41,6 @@ test
   })("Tags can be created and deleted", async (t) => {
     await t
       .useRole(roles.bucketObjectTags)
-      .click(acknowledgeButton)
       .typeText(elements.filterBuckets, "bucketobjecttags")
       .click(testBucketBrowseButtonFor("bucketobjecttags"))
       .click(
@@ -81,7 +80,6 @@ test
   })("User should not be able to create tag", async (t) => {
     await t
       .useRole(roles.bucketCannotTag)
-      .click(acknowledgeButton)
       .typeText(elements.filterBuckets, "bucketcannottag")
       .click(testBucketBrowseButtonFor("bucketcannottag"))
       .click(

web-app/tests/permissions-4/resourceTesting.ts

@@ -211,7 +211,6 @@ test
       .expect(file.exists)
       .ok()
       .navigateTo(`http://localhost:9090/browser`)
-      .click(acknowledgeButton)
       .click(test3BucketBrowseButton)
       .wait(1500)
       .click(Selector(".ReactVirtualized__Table__rowColumn").withText("home"))

web-app/tests/permissions-6/rewind.ts

@@ -50,7 +50,6 @@ test
   })("Rewind works in bucket", async (t) => {
     await t
       .useRole(roles.bucketReadWrite)
-      .click(acknowledgeButton)
       .typeText(elements.filterBuckets, "abucketrewind")
       .click(testBucketBrowseButtonFor("abucketrewind"))
       .expect(elements.table.exists)