From 76c537f224878dadb728f37224f654bb995ee43e Mon Sep 17 00:00:00 2001 From: miaawong Date: Thu, 10 Oct 2024 17:03:47 -0400 Subject: [PATCH] address pr feedback --- kurl_proxy/assets/insecure.html | 31 +++++++++++++++---- kurl_proxy/assets/tls.html | 2 +- kurl_proxy/assets/welcome.html | 2 +- web/src/Root.tsx | 2 +- web/src/components/PreflightResultPage.tsx | 2 +- .../apps/EmbeddedClusterManagement.tsx | 2 +- .../components/identity/ConfigureIngress.jsx | 2 +- .../components/modals/BackupRestoreModal.jsx | 8 ++--- .../modals/RestoreSnapshotModal.jsx | 2 +- .../snapshots/AppSnapshotRestore.jsx | 2 +- .../components/snapshots/SnapshotRestore.jsx | 2 +- .../components/snapshots/SnapshotSchedule.jsx | 2 +- web/src/components/snapshots/Snapshots.jsx | 2 +- .../GenerateSupportBundleModal.tsx | 4 +-- .../AddNewApp/components/InstallWithHelm.tsx | 2 +- .../api/getAdminConsoleUpdateStatus.tsx | 4 +-- .../api/postUpdateAdminConsole.tsx | 8 ++--- .../api/getDownloadAppVersionStatus.tsx | 2 +- .../Auth/components/SecureAdminConsole.tsx | 6 ++-- .../components/DashboardGitOpsCard.jsx | 2 +- .../features/Gitops/components/AppGitops.jsx | 2 +- .../Gitops/components/SetupProvider.jsx | 2 +- .../Gitops/components/modals/DisableModal.jsx | 2 +- 23 files changed, 57 insertions(+), 38 deletions(-) diff --git a/kurl_proxy/assets/insecure.html b/kurl_proxy/assets/insecure.html index c3b2088ac7..b2e6e2deb0 100644 --- a/kurl_proxy/assets/insecure.html +++ b/kurl_proxy/assets/insecure.html @@ -101,7 +101,7 @@ > check - Validate the environment & install {{.AppTitle}} + Validate the environment & deploy {{.AppTitle}} @@ -112,10 +112,10 @@

- We use a self-signed SSL/TLS Certificate to secure the - communication between your local machine and the Admin Console - during setup. You'll see a warning about this in your browser, - but you can be confident that this is secure. + We use a self-signed TLS Certificate to secure the communication + between your local machine and the Admin Console during setup. + You'll see a warning about this in your browser, but you can be + confident that this is secure.

@@ -177,6 +177,7 @@ 
                         
                         
+                        Copy command
@@ -208,7 +209,7 @@ @@ -230,5 +231,23 @@ document.getElementById("up-arrow").style.display = "none"; } }); + + document + .getElementById("copy-command") + .addEventListener("click", function () { + // Get the code inside the element + const codeSnippet = + document.getElementById("verify-snippet").textContent; + + // Copy the code to the clipboard + navigator.clipboard + .writeText(codeSnippet) + .then(() => { + alert("Command copied to clipboard!"); + }) + .catch((err) => { + console.error("Failed to copy text: ", err); + }); + }); diff --git a/kurl_proxy/assets/tls.html b/kurl_proxy/assets/tls.html index db58517edc..0ec796588f 100644 --- a/kurl_proxy/assets/tls.html +++ b/kurl_proxy/assets/tls.html @@ -77,7 +77,7 @@ style="width: 16px; height: 16px" /> - Validate the environment & install {{.AppTitle}} + Validate the environment & deploy {{.AppTitle}} diff --git a/kurl_proxy/assets/welcome.html b/kurl_proxy/assets/welcome.html index 242fdbc81d..5ecc7d848e 100644 --- a/kurl_proxy/assets/welcome.html +++ b/kurl_proxy/assets/welcome.html @@ -79,7 +79,7 @@ > check

- Validate the environment & install {{ .AppTitle }} + Validate the environment & deploy {{ .AppTitle }}

diff --git a/web/src/Root.tsx b/web/src/Root.tsx index 323f76f756..63c45cf434 100644 --- a/web/src/Root.tsx +++ b/web/src/Root.tsx @@ -705,7 +705,7 @@ const Root = () => { getStepProps(3).textColor }`} > - Validate the environment & Install{" "} + Validate the environment & deploy{" "} {state.selectedAppName || ""} diff --git a/web/src/components/PreflightResultPage.tsx b/web/src/components/PreflightResultPage.tsx index 33a66ca193..9b7d8c2777 100644 --- a/web/src/components/PreflightResultPage.tsx +++ b/web/src/components/PreflightResultPage.tsx @@ -82,7 +82,7 @@ function PreflightResultPage(props: Props) { {Utilities.isInitialAppInstall(selectedApp) && props.isEmbeddedCluster && (

- Validate the environment and deploy {selectedApp?.name} + Validate the environment & deploy {selectedApp?.name}

)} diff --git a/web/src/components/apps/EmbeddedClusterManagement.tsx b/web/src/components/apps/EmbeddedClusterManagement.tsx index 98a45ffd1c..22cacba7a7 100644 --- a/web/src/components/apps/EmbeddedClusterManagement.tsx +++ b/web/src/components/apps/EmbeddedClusterManagement.tsx @@ -421,7 +421,7 @@ const EmbeddedClusterManagement = ({ const AddNodeInstructions = () => { return (
-

+

Optionally add nodes to the cluster. Click{" "} Continue to proceed with a single node. diff --git a/web/src/components/identity/ConfigureIngress.jsx b/web/src/components/identity/ConfigureIngress.jsx index 624fd07075..2777a66b33 100644 --- a/web/src/components/identity/ConfigureIngress.jsx +++ b/web/src/components/identity/ConfigureIngress.jsx @@ -113,7 +113,7 @@ class ConfigureIngress extends Component {

{" "} - This is the host at which you can reach the admin console.{" "} + This is the host at which you can reach the Admin Console.{" "}

Select the type of backup you want to perform. A full restore of the - admin console, your application and its metadata, application config + Admin Console, your application and its metadata, application config and your database or a partial restore of your application and its metadata. All data not backed up will be lost and replaced with data in this backup. @@ -103,7 +103,7 @@ export default function BackupRestoreModal(props) { Will this be a full or partial restore?{" "}

- You can do a full restore of the application, admin console, and + You can do a full restore of the application, Admin Console, and databases or you can do a partial restore of just your application and its metadata.

@@ -169,11 +169,11 @@ export default function BackupRestoreModal(props) {

{" "} - Restore admin console{" "} + Restore Admin Console{" "}

{" "} - Only restores the admin console + Only restores the Admin Console

diff --git a/web/src/components/modals/RestoreSnapshotModal.jsx b/web/src/components/modals/RestoreSnapshotModal.jsx index fe1bbc88cb..02198f748f 100644 --- a/web/src/components/modals/RestoreSnapshotModal.jsx +++ b/web/src/components/modals/RestoreSnapshotModal.jsx @@ -70,7 +70,7 @@ export default function RestoreSnapshotModal(props) { Restoring to this version will remove data and replace it with data from the restored version. During the restoration, your application will not be available and you will not be able to use - the admin console. This action cannot be reversed.{" "} + the Admin Console. This action cannot be reversed.{" "}

diff --git a/web/src/components/snapshots/AppSnapshotRestore.jsx b/web/src/components/snapshots/AppSnapshotRestore.jsx index e034f53ff5..6aeee9fa34 100644 --- a/web/src/components/snapshots/AppSnapshotRestore.jsx +++ b/web/src/components/snapshots/AppSnapshotRestore.jsx @@ -337,7 +337,7 @@ class AppSnapshotRestore extends Component {

{" "} After all volumes have been restored you will need to log back in - to the admin console.{" "} + to the Admin Console.{" "}

{restoreLoading && ( diff --git a/web/src/components/snapshots/SnapshotRestore.jsx b/web/src/components/snapshots/SnapshotRestore.jsx index 56faeb1057..ac2efcd288 100644 --- a/web/src/components/snapshots/SnapshotRestore.jsx +++ b/web/src/components/snapshots/SnapshotRestore.jsx @@ -354,7 +354,7 @@ class SnapshotRestore extends Component {

{" "} After all volumes have been restored you will need to log back in - to the admin console.{" "} + to the Admin Console.{" "}

{restoreLoading && ( diff --git a/web/src/components/snapshots/SnapshotSchedule.jsx b/web/src/components/snapshots/SnapshotSchedule.jsx index eab466f78f..a997086196 100644 --- a/web/src/components/snapshots/SnapshotSchedule.jsx +++ b/web/src/components/snapshots/SnapshotSchedule.jsx @@ -539,7 +539,7 @@ class SnapshotSchedule extends Component {

Scheduled {featureName}s

- Configure a schedule for {featureName}s of the admin console and + Configure a schedule for {featureName}s of the Admin Console and all application data.

diff --git a/web/src/components/snapshots/Snapshots.jsx b/web/src/components/snapshots/Snapshots.jsx index 8ad94f72a7..a2607c68f3 100644 --- a/web/src/components/snapshots/Snapshots.jsx +++ b/web/src/components/snapshots/Snapshots.jsx @@ -597,7 +597,7 @@ class Snapshots extends Component {

- Back up the admin console and all application data for + Back up the Admin Console and all application data for disaster recovery.{" "} {!this.props.isEmbeddedCluster && ( <> diff --git a/web/src/components/troubleshoot/GenerateSupportBundleModal.tsx b/web/src/components/troubleshoot/GenerateSupportBundleModal.tsx index 45d9d471e6..266e482d5d 100644 --- a/web/src/components/troubleshoot/GenerateSupportBundleModal.tsx +++ b/web/src/components/troubleshoot/GenerateSupportBundleModal.tsx @@ -318,7 +318,7 @@ const GenerateSupportBundleModal = ({

Run the following commands to generate a support bundle from the CLI. You can then upload a support bundle so that it - appears in the admin console. + appears in the Admin Console.

{" "} to get a command to manually generate a support bundle. This is - useful if the admin console is inaccessible. + useful if the Admin Console is inaccessible.
) diff --git a/web/src/features/AddNewApp/components/InstallWithHelm.tsx b/web/src/features/AddNewApp/components/InstallWithHelm.tsx index d6eb7687fa..3f959d176e 100644 --- a/web/src/features/AddNewApp/components/InstallWithHelm.tsx +++ b/web/src/features/AddNewApp/components/InstallWithHelm.tsx @@ -30,7 +30,7 @@ function InstallWithHelm() { className="u-fontSize--normal u-textColor--accent u-fontWeight--medium u-lineHeight--normal u-marginTop--20 u-marginRight--30 u-marginLeft--30" style={{ maxWidth: "300px" }} > - In order to use the admin console you need to install a Helm + In order to use the Admin Console you need to install a Helm chart.

diff --git a/web/src/features/AdminConsole/api/getAdminConsoleUpdateStatus.tsx b/web/src/features/AdminConsole/api/getAdminConsoleUpdateStatus.tsx index bfb6b3defd..f58825a399 100644 --- a/web/src/features/AdminConsole/api/getAdminConsoleUpdateStatus.tsx +++ b/web/src/features/AdminConsole/api/getAdminConsoleUpdateStatus.tsx @@ -21,7 +21,7 @@ async function getAdminConsoleUpdateStatus({ if (!response.ok) { throw new Error( - `Error while trying to get admin console update status: ${response.status}` + `Error while trying to get Admin Console update status: ${response.status}` ); } @@ -48,7 +48,7 @@ function useAdminConsoleUpdateStatus({ slug }: { slug: string }) { console.log(err); throw new Error( err.message || - "Error while trying to get admin console update status. Please try again." + "Error while trying to get Admin Console update status. Please try again." ); }, }); diff --git a/web/src/features/AdminConsole/api/postUpdateAdminConsole.tsx b/web/src/features/AdminConsole/api/postUpdateAdminConsole.tsx index af52232b6c..33748480f6 100644 --- a/web/src/features/AdminConsole/api/postUpdateAdminConsole.tsx +++ b/web/src/features/AdminConsole/api/postUpdateAdminConsole.tsx @@ -23,7 +23,7 @@ async function postUpdateAdminConsole({ if (!response.ok) { throw new Error( - `Error while trying to update admin console: ${response.status}` + `Error while trying to update Admin Console: ${response.status}` ); } @@ -32,11 +32,11 @@ async function postUpdateAdminConsole({ } catch (err) { if (err instanceof Error) { throw new Error( - `Error while trying to unmarshal update admin console response: ${err.message}` + `Error while trying to unmarshal update Admin Console response: ${err.message}` ); } throw new Error( - `Error while trying to unmarshal update admin console response` + `Error while trying to unmarshal update Admin Console response` ); } } @@ -59,7 +59,7 @@ function useUpdateAdminConsole({ console.log(err); throw new Error( err.message || - "Error while trying to update admin console. Please try again." + "Error while trying to update Admin Console. Please try again." ); }, onSuccess: () => { diff --git a/web/src/features/AppVersionHistory/api/getDownloadAppVersionStatus.tsx b/web/src/features/AppVersionHistory/api/getDownloadAppVersionStatus.tsx index 8de3fc7f9f..cf78416b5b 100644 --- a/web/src/features/AppVersionHistory/api/getDownloadAppVersionStatus.tsx +++ b/web/src/features/AppVersionHistory/api/getDownloadAppVersionStatus.tsx @@ -57,7 +57,7 @@ function useAdminConsoleUpdateStatus({ console.log(err); throw new Error( err.message || - "Error while trying to get admin console update status. Please try again." + "Error while trying to get Admin Console update status. Please try again." ); }, }); diff --git a/web/src/features/Auth/components/SecureAdminConsole.tsx b/web/src/features/Auth/components/SecureAdminConsole.tsx index f3f7f7ad66..8fcb56a77f 100644 --- a/web/src/features/Auth/components/SecureAdminConsole.tsx +++ b/web/src/features/Auth/components/SecureAdminConsole.tsx @@ -359,13 +359,13 @@ class SecureAdminConsole extends Component { > Log in {appName && appName !== "" - ? ` to ${appName} admin console` - : " to admin console"} + ? ` to ${appName} Admin Console` + : " to Admin Console"}

- Enter the password to access the {appName} admin console. + Enter the password to access the {appName} Admin Console.

{loginErr && ( diff --git a/web/src/features/Dashboard/components/DashboardGitOpsCard.jsx b/web/src/features/Dashboard/components/DashboardGitOpsCard.jsx index d8aaea6519..de22d24dbb 100644 --- a/web/src/features/Dashboard/components/DashboardGitOpsCard.jsx +++ b/web/src/features/Dashboard/components/DashboardGitOpsCard.jsx @@ -96,7 +96,7 @@ export default function DashboardGitOpsCard(props) { > Config {" "} - page in the admin console. + page in the Admin Console.

diff --git a/web/src/features/Gitops/components/AppGitops.jsx b/web/src/features/Gitops/components/AppGitops.jsx index f031111147..f3eaa0dd23 100644 --- a/web/src/features/Gitops/components/AppGitops.jsx +++ b/web/src/features/Gitops/components/AppGitops.jsx @@ -187,7 +187,7 @@ const AppGitops = () => {

Connect a git version control system so all application updates are committed to a git repository.
When GitOps is enabled, you - cannot deploy updates directly from the admin console. + cannot deploy updates directly from the Admin Console.

diff --git a/web/src/features/Gitops/components/SetupProvider.jsx b/web/src/features/Gitops/components/SetupProvider.jsx index 63b57330df..4caee92fae 100644 --- a/web/src/features/Gitops/components/SetupProvider.jsx +++ b/web/src/features/Gitops/components/SetupProvider.jsx @@ -97,7 +97,7 @@ const SetupProvider = ({ appName }) => { Connect a git version control system so all application updates are committed to a git repository.
When GitOps is enabled, you cannot deploy updates directly from - the admin console. + the Admin Console.

diff --git a/web/src/features/Gitops/components/modals/DisableModal.jsx b/web/src/features/Gitops/components/modals/DisableModal.jsx index 6ac38065ee..e274728ede 100644 --- a/web/src/features/Gitops/components/modals/DisableModal.jsx +++ b/web/src/features/Gitops/components/modals/DisableModal.jsx @@ -29,7 +29,7 @@ const DisableModal = ({ isOpen, setOpen, disableGitOps, provider }) => {

Commits will no longer be made to your repository, and you will have to
- deploy from the admin console. + deploy from the Admin Console.