Skip to content

Commit 7148f16

Browse files
committed
Some small UI wording changes
1 parent 7f5fd80 commit 7148f16

File tree

9 files changed

+21
-14
lines changed

9 files changed

+21
-14
lines changed

api/internal/managers/infra/install.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
)
3232

33-
const K0sComponentName = "Runtime"
33+
const K0sComponentName = "runtime"
3434

3535
func AlreadyInstalledError() error {
3636
return fmt.Errorf(
@@ -89,7 +89,7 @@ func (m *infraManager) initComponentsList(license *kotsv1beta1.License, rc runti
8989
components = append(components, types.InfraComponent{Name: addOn.Name()})
9090
}
9191

92-
components = append(components, types.InfraComponent{Name: "Additional Components"})
92+
components = append(components, types.InfraComponent{Name: "additional components"})
9393

9494
for _, component := range components {
9595
if err := m.infraStore.RegisterComponent(component.Name); err != nil {
@@ -328,7 +328,7 @@ func (m *infraManager) installAddOns(ctx context.Context, license *kotsv1beta1.L
328328
}
329329

330330
func (m *infraManager) installExtensions(ctx context.Context, hcli helm.Client) (finalErr error) {
331-
componentName := "Additional Components"
331+
componentName := "additional components"
332332

333333
if err := m.setComponentStatus(componentName, types.StateRunning, "Installing"); err != nil {
334334
return fmt.Errorf("set extensions status: %w", err)

pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type EmbeddedClusterOperator struct {
4747
}
4848

4949
func (e *EmbeddedClusterOperator) Name() string {
50-
return "Runtime Operator"
50+
return "runtime operator"
5151
}
5252

5353
func (e *EmbeddedClusterOperator) Version() string {

pkg/addons/openebs/openebs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type OpenEBS struct {
1818
}
1919

2020
func (o *OpenEBS) Name() string {
21-
return "Storage"
21+
return "storage"
2222
}
2323

2424
func (o *OpenEBS) Version() string {

pkg/addons/velero/velero.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type Velero struct {
4343
}
4444

4545
func (v *Velero) Name() string {
46-
return "Disaster Recovery"
46+
return "disaster recovery"
4747
}
4848

4949
func (v *Velero) Version() string {

web/src/components/wizard/CompletionStep.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ import { CheckCircle, ExternalLink } from "lucide-react";
88
const CompletionStep: React.FC = () => {
99
const { config } = useConfig();
1010
const { title } = useBranding();
11+
const { prototypeSettings } = useConfig();
12+
const themeColor = prototypeSettings.themeColor;
1113

1214
return (
1315
<div className="space-y-6">
1416
<Card>
1517
<div className="flex flex-col items-center text-center py-6">
1618
<div className="flex flex-col items-center justify-center mb-6">
1719
<div className="w-16 h-16 rounded-full flex items-center justify-center mb-4">
18-
<CheckCircle className="w-10 h-10" style={{ color: "blue" }} />
20+
<CheckCircle className="w-10 h-10" style={{ color: themeColor }} />
1921
</div>
2022
<p className="text-gray-600 mt-2">
2123
Visit the Admin Console to configure and install {title}

web/src/components/wizard/InstallationStep.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const InstallationStep: React.FC<InstallationStepProps> = ({ onNext }) => {
6868
<div className="space-y-6">
6969
<InstallationProgress
7070
progress={getProgress()}
71-
currentMessage={infraStatusResponse?.status?.description || ''}
71+
currentMessage={infraStatusResponse?.status?.state === 'Failed' ? 'Installation failed' : (infraStatusResponse?.status?.description || '')}
7272
themeColor={themeColor}
7373
status={infraStatusResponse?.status?.state}
7474
/>
@@ -77,7 +77,7 @@ const InstallationStep: React.FC<InstallationStepProps> = ({ onNext }) => {
7777
{(infraStatusResponse?.components || []).map((component, index) => (
7878
<StatusIndicator
7979
key={index}
80-
title={component.name}
80+
title={component.name.split(' ').map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(' ')}
8181
status={component.status?.state}
8282
themeColor={themeColor}
8383
/>

web/src/components/wizard/SetupStep.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const SetupStep: React.FC<SetupStepProps> = ({ onNext }) => {
142142
<Card>
143143
<div className="mb-6">
144144
<h2 className="text-2xl font-bold text-gray-900">{text.setupTitle}</h2>
145-
<p className="text-gray-600 mt-1">Configure the installation settings.</p>
145+
<p className="text-gray-600 mt-1">Set up the host for this installation.</p>
146146
</div>
147147

148148
{isLoading ? (

web/src/components/wizard/installation/InstallationProgress.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ const InstallationProgress: React.FC<InstallationProgressProps> = ({
1313
themeColor,
1414
status
1515
}) => {
16+
const displayMessage = () => {
17+
if (!currentMessage) return 'Preparing installation…';
18+
return status === 'Running' ? `${currentMessage}…` : currentMessage;
19+
};
20+
1621
return (
1722
<div className="mb-6">
1823
<div className="w-full bg-gray-200 rounded-full h-2.5">
@@ -25,7 +30,7 @@ const InstallationProgress: React.FC<InstallationProgressProps> = ({
2530
/>
2631
</div>
2732
<p className="text-sm text-gray-500 mt-2">
28-
{currentMessage || 'Preparing installation...'}
33+
{displayMessage()}
2934
</p>
3035
</div>
3136
);

web/src/components/wizard/tests/SetupStep.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe("SetupStep", () => {
7979
// Wait for loading to complete
8080
await screen.findByText("Loading configuration...");
8181

82-
await screen.findByText("Configure the installation settings.");
82+
await screen.findByText("Set up the host for the installation.");
8383

8484
// Wait for the linux-setup element to appear
8585
await screen.findByTestId("linux-setup");
@@ -156,7 +156,7 @@ describe("SetupStep", () => {
156156

157157
// Wait for loading to complete
158158
await screen.findByText("Loading configuration...");
159-
await screen.findByText("Configure the installation settings.");
159+
await screen.findByText("Set up the host for the installation.");
160160

161161
// Wait for the linux-setup element to appear
162162
await screen.findByTestId("linux-setup");
@@ -250,7 +250,7 @@ describe("SetupStep", () => {
250250

251251
// Wait for loading to complete
252252
await screen.findByText("Loading configuration...");
253-
await screen.findByText("Configure the installation settings.");
253+
await screen.findByText("Set up the host for the installation.");
254254

255255
// Wait for the linux-setup element to appear
256256
await screen.findByTestId("linux-setup");

0 commit comments

Comments
 (0)