Skip to content
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.

Sign up for GitHub

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

ARC-2560 - Indicate the expiry date of the deferred link #2520

Merged
merged 4 commits into from
Oct 27, 2023
Merged

ARC-2560 - Indicate the expiry date of the deferred link #2520

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3110965
- Adding a expire link info
krazziekay Oct 27, 2023
2db7d2d
Merge branch 'main' into ARC-2560
krazziekay Oct 27, 2023
548907a
- Updated UI
krazziekay Oct 27, 2023
5d64d0a
Merge remote-tracking branch 'origin/ARC-2560' into ARC-2560
krazziekay Oct 27, 2023
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
10 changes: 10 additions & 0 deletions spa/src/components/Error/KnownErrors/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import Modal, {
import TextArea from "@atlaskit/textarea";
import Spinner from "@atlaskit/spinner";
import Button from "@atlaskit/button";
import WarningIcon from "@atlaskit/icon/glyph/warning";

const olStyle = css`
padding-left: 1.2em;
Expand All @@ -35,6 +36,11 @@ const linkStyle = css`
const textAreaStyle = css`
margin-top: 20px;
`;
const expireTextWrapperStyle = css`
display: flex;
align-items: center;
margin-top: ${token("space.100")};
`;

/************************************************************************
* UI view for the 3 known errors
Expand Down Expand Up @@ -137,6 +143,10 @@ export const ErrorForNonAdmins = ({ orgName, adminOrgsUrl, onPopupBlocked, defer
Find an organization owner
</a>
</div>
<div css={expireTextWrapperStyle}>
<WarningIcon label="warning" primaryColor={token("color.background.warning.bold")} />
<b>Note that the following link will expire after 2 days.</b>
</div>
<TextArea
onCopy={() => {
analyticsClient.sendUIEvent({ actionSubject: "copiedDeferredInstallationUrl", action: "clicked"}, { type: "cloud" });
Expand Down
Loading