Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ linters:
testifylint:
disable:
- go-require
revive:
rules:
- name: "var-naming"
disabled: true
exclusions:
generated: lax
rules:
Expand Down
17 changes: 9 additions & 8 deletions web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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]"
Expand Down
31 changes: 3 additions & 28 deletions web-app/src/screens/Console/License/LicenseConsentModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -172,25 +157,15 @@ const LicenseConsentModal = () => {
marginTop: "19px",
display: "flex",
alignItems: "center",
justifyContent: "space-between",
justifyContent: "center",
}}
>
<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>
Expand Down
3 changes: 2 additions & 1 deletion web-app/src/systemSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -85,7 +86,7 @@ const initialState: SystemState = {
darkMode: isDarkModeOn(),
filterBucketList: "",
loadBucketsListing: true,
licenseAcknowledged: false,
licenseAcknowledged: getLicenseConsent(),
};

const systemSlice = createSlice({
Expand Down
1 change: 0 additions & 1 deletion web-app/tests/permissions-3/bucketDeleteAllVersions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ test
);
await t
.useRole(roles.bucketReadWrite)
.click(acknowledgeButton)
.typeText(elements.filterBuckets, "bucketdelete3")
.click(testBucketBrowseButtonFor("bucketdelete3"))
.click(
Expand Down
2 changes: 0 additions & 2 deletions web-app/tests/permissions-3/bucketObjectTags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion web-app/tests/permissions-4/resourceTesting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
1 change: 0 additions & 1 deletion web-app/tests/permissions-6/rewind.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading
Loading