Skip to content

Move Register Component to Redux #2630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 6, 2023

Conversation

dvaldivia
Copy link
Collaborator

Signed-off-by: Daniel Valdivia 18384552+dvaldivia@users.noreply.github.com

@prakashsvmx
Copy link
Member

@dvaldivia could you please resolve the conflicts ?

@dvaldivia
Copy link
Collaborator Author

resolved @prakashsvmx

@prakashsvmx
Copy link
Member

@dvaldivia
The registration is done in SUBNET but the license is not reflected in Console.
Tried with the following flows:

  • Login
  • API Key
  • Registered via mc

image

When tried with local SUBNET dev

image

@dvaldivia
Copy link
Collaborator Author

@prakashsvmx can you also test on master? I think it's also broken there, I'll debug this and try to come up with a fix

@dvaldivia
Copy link
Collaborator Author

@prakashsvmx I've verified the same problem happens on master, will address it either in this PR or a separate one

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
@dvaldivia
Copy link
Collaborator Author

@prakashsvmx issue has been addressed

@allanrogerr
Copy link
Contributor

Validated licence available in console
image

Copy link
Member

@prakashsvmx prakashsvmx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor review comment.

Tested the following Flows: Changes look Good to me 👍

MinIO Console

  • Online Registration
  • API Key Registration
  • Air-Gap Registration

Operator Console

  • API Key Registration

const offlineRegUrl = `https://subnet.min.io/cluster/register?token=${subnetRegToken}`;

return (
<Fragment>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<Fragment>
<Fragment>
<Box
sx={{
border: "1px solid #eaeaea",
borderRadius: "2px",
display: "flex",
flexFlow: "column",
padding: "43px",
}}
>
{clusterRegistered && licenseInfo ? (
<ClusterRegistered email={licenseInfo.email} />
) : (
<Fragment>
<Box
sx={{
"& .title-text": {
marginLeft: "27px",
fontWeight: 600,
},
}}
>
<FormTitle
icon={<OfflineRegistrationIcon />}
title={`Register cluster in an Air-gap environment`}
/>
</Box>
<Box
sx={{
display: "flex",
}}
>
<Box
sx={{
display: "flex",
flexFlow: "column",
flex: "2",
marginTop: "15px",
"& .step-number": {
color: "#ffffff",
height: "25px",
width: "25px",
background: "#081C42",
marginRight: "10px",
textAlign: "center",
fontWeight: 600,
borderRadius: "50%",
},
"& .step-row": {
fontSize: "16px",
display: "flex",
marginTop: "15px",
marginBottom: "15px",
},
}}
>
<Box>
<Box className="step-row">
<div className="step-text">
Click on the link to register this cluster in SUBNET
</div>
</Box>
<Box
sx={{
flex: "1",
display: "flex",
alignItems: "center",
gap: 3,
}}
>
<Link
style={{
color: "#2781B0",
cursor: "pointer",
}}
color="inherit"
href={offlineRegUrl}
target="_blank"
>
https://subnet.min.io/cluster/register
</Link>
<TooltipWrapper tooltip={"Copy to Clipboard"}>
<CopyToClipboard text={offlineRegUrl}>
<Button
type={"button"}
id={"copy-ult-to-clip-board"}
icon={<CopyIcon />}
color={"primary"}
variant={"regular"}
/>
</CopyToClipboard>
</TooltipWrapper>
</Box>
<div
style={{
marginTop: "25px",
fontSize: "14px",
fontStyle: "italic",
color: "#5E5E5E",
}}
>
If this machine does not have internet connection, Copy
paste the following URL in a browser where you access SUBNET
and follow the instructions to complete the registration
</div>
</Box>
</Box>
<RegisterHelpBox />
</Box>
</Fragment>
)}
</Box>
</Fragment>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once the cluster is registered in Air-Gap mode, the registration instructions could be hidden like other methods.

@dvaldivia dvaldivia enabled auto-merge (squash) February 6, 2023 20:18
@dvaldivia dvaldivia disabled auto-merge February 6, 2023 21:51
@dvaldivia dvaldivia merged commit 24fdf34 into minio:master Feb 6, 2023
@dvaldivia dvaldivia deleted the register-rtk-slice branch February 6, 2023 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants