Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf9feb97

Browse files
committed
frontend hacking
1 parent390217b commitf9feb97

File tree

7 files changed

+45
-14
lines changed

7 files changed

+45
-14
lines changed

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,30 @@ export const RequiresExternalAuth: Story = {
130130
],
131131
},
132132
};
133+
134+
exportconstOptionalExternalAuth:Story={
135+
args:{
136+
externalAuth:[
137+
{
138+
id:"github",
139+
type:"github",
140+
authenticated:false,
141+
authenticate_url:"",
142+
display_icon:"/icon/github.svg",
143+
display_name:"GitHub",
144+
//@ts-expect-error
145+
optional:true,
146+
},
147+
{
148+
id:"gitlab",
149+
type:"gitlab",
150+
authenticated:true,
151+
authenticate_url:"",
152+
display_icon:"/icon/gitlab.svg",
153+
display_name:"GitLab",
154+
//@ts-expect-error
155+
optional:true,
156+
},
157+
],
158+
},
159+
};

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {
4242
CreateWorkspaceMode,
4343
ExternalAuthPollingState,
4444
}from"./CreateWorkspacePage";
45-
import{ExternalAuthBanner}from"./ExternalAuthBanner/ExternalAuthBanner";
45+
import{ExternalAuthWall}from"./ExternalAuthWall/ExternalAuthWall";
4646
import{CreateWSPermissions}from"./permissions";
4747

4848
exportconstLanguage={
@@ -172,7 +172,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
172172
</PageHeader>
173173

174174
{requiresExternalAuth ?(
175-
<ExternalAuthBanner
175+
<ExternalAuthWall
176176
providers={externalAuth}
177177
pollingState={externalAuthPollingState}
178178
onStartPolling={startPollingExternalAuth}

‎site/src/pages/CreateWorkspacePage/ExternalAuthBanner/ExternalAuthItem.stories.tsxrenamed to‎site/src/pages/CreateWorkspacePage/ExternalAuthWall/ExternalAuthItem.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const MockExternalAuth: TemplateVersionExternalAuth = {
1212
};
1313

1414
constmeta:Meta<typeofExternalAuthItem>={
15-
title:"pages/CreateWorkspacePage/ExternalAuthBanner/ExternalAuthItem",
15+
title:"pages/CreateWorkspacePage/ExternalAuthWall/ExternalAuthItem",
1616
component:ExternalAuthItem,
1717
decorators:[
1818
(Story)=>(

‎site/src/pages/CreateWorkspacePage/ExternalAuthBanner/ExternalAuthItem.tsxrenamed to‎site/src/pages/CreateWorkspacePage/ExternalAuthWall/ExternalAuthItem.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { ExternalImage } from "components/ExternalImage/ExternalImage";
66
import{FC,useEffect,useState}from"react";
77
// eslint-disable-next-line no-restricted-imports -- used to allow extension with "component"
88
importBox,{BoxProps}from"@mui/material/Box";
9+
import{Pill}from"components/Pill/Pill";
910

1011
typeStatus="idle"|"connecting";
1112

@@ -36,6 +37,9 @@ export const ExternalAuthItem: FC<ExternalAuthItemProps> = ({
3637
<spancss={styles.providerHeader}>
3738
<ExternalImagesrc={provider.display_icon}css={styles.providerIcon}/>
3839
<strongcss={styles.providerName}>{provider.display_name}</strong>
40+
{!provider.authenticated&&(providerasany).optional&&(
41+
<Pilltype="notice">Optional</Pill>
42+
)}
3943
</span>
4044
{provider.authenticated ?(
4145
<spancss={styles.providerConnectedLabel}>

‎site/src/pages/CreateWorkspacePage/ExternalAuthBanner/ExternalAuthBanner.stories.tsxrenamed to‎site/src/pages/CreateWorkspacePage/ExternalAuthWall/ExternalAuthWall.stories.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{TemplateVersionExternalAuth}from"api/typesGenerated";
2-
import{ExternalAuthBanner}from"./ExternalAuthBanner";
2+
import{ExternalAuthWall}from"./ExternalAuthWall";
33
importtype{Meta,StoryObj}from"@storybook/react";
44

55
constMockExternalAuth:TemplateVersionExternalAuth={
@@ -11,13 +11,13 @@ const MockExternalAuth: TemplateVersionExternalAuth = {
1111
authenticated:false,
1212
};
1313

14-
constmeta:Meta<typeofExternalAuthBanner>={
15-
title:"pages/CreateWorkspacePage/ExternalAuthBanner",
16-
component:ExternalAuthBanner,
14+
constmeta:Meta<typeofExternalAuthWall>={
15+
title:"pages/CreateWorkspacePage/ExternalAuthWall",
16+
component:ExternalAuthWall,
1717
};
1818

1919
exportdefaultmeta;
20-
typeStory=StoryObj<typeofExternalAuthBanner>;
20+
typeStory=StoryObj<typeofExternalAuthWall>;
2121

2222
exportconstDefault:Story={
2323
args:{

‎site/src/pages/CreateWorkspacePage/ExternalAuthBanner/ExternalAuthBanner.tsxrenamed to‎site/src/pages/CreateWorkspacePage/ExternalAuthWall/ExternalAuthWall.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import{Interpolation,Theme}from"@emotion/react";
2-
import{TemplateVersionExternalAuth}from"api/typesGenerated";
3-
import{ExternalAuthPollingState}from"../CreateWorkspacePage";
1+
import{typeInterpolation,typeTheme}from"@emotion/react";
2+
import{typeFC}from"react";
3+
import{typeTemplateVersionExternalAuth}from"api/typesGenerated";
4+
import{typeExternalAuthPollingState}from"../CreateWorkspacePage";
45
import{ExternalAuthItem}from"./ExternalAuthItem";
5-
import{FC}from"react";
66

7-
typeExternalAuthBannerProps={
7+
typeExternalAuthWallProps={
88
providers:TemplateVersionExternalAuth[];
99
pollingState:ExternalAuthPollingState;
1010
onStartPolling:()=>void;
1111
};
1212

13-
exportconstExternalAuthBanner:FC<ExternalAuthBannerProps>=({
13+
exportconstExternalAuthWall:FC<ExternalAuthWallProps>=({
1414
providers,
1515
pollingState,
1616
onStartPolling,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp