Skip to content

feat(site): display error messages on ws and access url health pages #12430

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

Merged
merged 1 commit into from
Mar 5, 2024
Merged

feat(site): display error messages on ws and access url health pages #12430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 28 additions & 2 deletions site/src/pages/HealthPage/AccessURLPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { StoryObj, Meta } from "@storybook/react";
import { StoryObj } from "@storybook/react";
import { AccessURLPage } from "./AccessURLPage";
import { generateMeta } from "./storybook";
import { HEALTH_QUERY_KEY } from "api/queries/debug";
import { MockHealth } from "testHelpers/entities";
import { HealthcheckReport } from "api/typesGenerated";

const meta: Meta = {
const meta = {
title: "pages/Health/AccessURL",
...generateMeta({
path: "/health/access-url",
Expand All @@ -15,4 +18,27 @@ type Story = StoryObj;

const Example: Story = {};

const settingsWithError: HealthcheckReport = {
...MockHealth,
severity: "error",
access_url: {
...MockHealth.access_url,
severity: "error",
error:
'EACS03: get healthz endpoint: Get "https://localhost:7080/healthz": http: server gave HTTP response to HTTPS client',
},
};

export const WithError: Story = {
parameters: {
queries: [
...meta.parameters.queries,
{
key: HEALTH_QUERY_KEY,
data: settingsWithError,
},
],
},
};

export { Example as AccessURL };
2 changes: 2 additions & 0 deletions site/src/pages/HealthPage/AccessURLPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export const AccessURLPage = () => {
</Header>

<Main>
{accessUrl.error && <Alert severity="error">{accessUrl.error}</Alert>}

{accessUrl.warnings.map((warning) => {
return (
<Alert
Expand Down
30 changes: 28 additions & 2 deletions site/src/pages/HealthPage/WebsocketPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { StoryObj, Meta } from "@storybook/react";
import { StoryObj } from "@storybook/react";
import { WebsocketPage } from "./WebsocketPage";
import { generateMeta } from "./storybook";
import { HEALTH_QUERY_KEY } from "api/queries/debug";
import { HealthcheckReport } from "api/typesGenerated";
import { MockHealth } from "testHelpers/entities";

const meta: Meta = {
const meta = {
title: "pages/Health/Websocket",
...generateMeta({
path: "/health/websocket",
Expand All @@ -15,4 +18,27 @@ type Story = StoryObj;

const Example: Story = {};

const settingsWithError: HealthcheckReport = {
...MockHealth,
severity: "error",
websocket: {
...MockHealth.websocket,
severity: "error",
error:
'EACS03: get healthz endpoint: Get "https://localhost:7080/healthz": http: server gave HTTP response to HTTPS client',
},
};

export const WithError: Story = {
parameters: {
queries: [
...meta.parameters.queries,
{
key: HEALTH_QUERY_KEY,
data: settingsWithError,
},
],
},
};

export { Example as Websocket };
2 changes: 2 additions & 0 deletions site/src/pages/HealthPage/WebsocketPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export const WebsocketPage = () => {
</Header>

<Main>
{websocket.error && <Alert severity="error">{websocket.error}</Alert>}

{websocket.warnings.map((warning) => {
return (
<Alert key={warning} severity="warning">
Expand Down
30 changes: 28 additions & 2 deletions site/src/pages/HealthPage/WorkspaceProxyPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { StoryObj, Meta } from "@storybook/react";
import { StoryObj } from "@storybook/react";
import { WorkspaceProxyPage } from "./WorkspaceProxyPage";
import { generateMeta } from "./storybook";
import { HealthcheckReport } from "api/typesGenerated";
import { HEALTH_QUERY_KEY } from "api/queries/debug";
import { MockHealth } from "testHelpers/entities";

const meta: Meta = {
const meta = {
title: "pages/Health/WorkspaceProxy",
...generateMeta({
path: "/health/workspace-proxy",
Expand All @@ -15,4 +18,27 @@ type Story = StoryObj;

const Example: Story = {};

const settingsWithError: HealthcheckReport = {
...MockHealth,
severity: "error",
workspace_proxy: {
...MockHealth.workspace_proxy,
severity: "error",
error:
'EACS03: get healthz endpoint: Get "https://localhost:7080/healthz": http: server gave HTTP response to HTTPS client',
},
};

export const WithError: Story = {
parameters: {
queries: [
...meta.parameters.queries,
{
key: HEALTH_QUERY_KEY,
data: settingsWithError,
},
],
},
};

export { Example as WorkspaceProxy };
4 changes: 2 additions & 2 deletions site/src/pages/HealthPage/storybook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type MetaOptions = {
params?: Record<string, string>;
};

export const generateMeta = ({ element, path, params }: MetaOptions): Meta => {
export const generateMeta = ({ element, path, params }: MetaOptions) => {
return {
component: HealthLayout,
parameters: {
Expand All @@ -43,5 +43,5 @@ export const generateMeta = ({ element, path, params }: MetaOptions): Meta => {
],
decorators: [withDashboardProvider],
},
};
} satisfies Meta;
};