Skip to content

Commit 722ff50

Browse files
fix: add service banner to workspace page (#12381)
1 parent 4f0b885 commit 722ff50

File tree

1 file changed

+22
-18
lines changed

1 file changed

+22
-18
lines changed

site/src/pages/WorkspacePage/WorkspacePage.tsx

+22-18
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { checkAuthorization } from "api/queries/authCheck";
1010
import { useEffectEvent } from "hooks/hookPolyfills";
1111
import { useOrganizationId } from "contexts/auth/useOrganizationId";
1212
import { Navbar } from "modules/dashboard/Navbar/Navbar";
13+
import { ServiceBanner } from "modules/dashboard/ServiceBanner/ServiceBanner";
1314
import { ErrorAlert } from "components/Alert/ErrorAlert";
1415
import { Loader } from "components/Loader/Loader";
1516
import { Margins } from "components/Margins/Margins";
@@ -104,25 +105,28 @@ export const WorkspacePage: FC = () => {
104105
const isLoading = !workspace || !template || !permissions;
105106

106107
return (
107-
<div css={{ height: "100%", display: "flex", flexDirection: "column" }}>
108-
<Navbar />
109-
{pageError ? (
110-
<Margins>
111-
<ErrorAlert
112-
error={pageError}
113-
css={{ marginTop: 16, marginBottom: 16 }}
108+
<>
109+
<ServiceBanner />
110+
<div css={{ height: "100%", display: "flex", flexDirection: "column" }}>
111+
<Navbar />
112+
{pageError ? (
113+
<Margins>
114+
<ErrorAlert
115+
error={pageError}
116+
css={{ marginTop: 16, marginBottom: 16 }}
117+
/>
118+
</Margins>
119+
) : isLoading ? (
120+
<Loader />
121+
) : (
122+
<WorkspaceReadyPage
123+
workspace={workspace}
124+
template={template}
125+
permissions={permissions}
114126
/>
115-
</Margins>
116-
) : isLoading ? (
117-
<Loader />
118-
) : (
119-
<WorkspaceReadyPage
120-
workspace={workspace}
121-
template={template}
122-
permissions={permissions}
123-
/>
124-
)}
125-
</div>
127+
)}
128+
</div>
129+
</>
126130
);
127131
};
128132

0 commit comments

Comments
 (0)