Skip to content

Commit 983abae

Browse files
liavweissLiav Weiss (EXT-Nokia)
authored and
mkoushni
committed
feat(ws): Notebooks 2.0 // Frontend // Workspaces details // Pod template tab kubeflow#173 (kubeflow#197)
* feat(ws): Notebooks 2.0 // Frontend // Workspaces details // Pod template tab kubeflow#173 Signed-off-by: Liav Weiss (EXT-Nokia) <liav.weiss.ext@nokia.com> * feat(ws): Notebooks 2.0 // Frontend // Workspaces details // Pod template tab kubeflow#173 Signed-off-by: Liav Weiss (EXT-Nokia) <liav.weiss.ext@nokia.com> * feat(ws): Notebooks 2.0 // Frontend // Workspaces details // Pod template tab kubeflow#173 Signed-off-by: Liav Weiss (EXT-Nokia) <liav.weiss.ext@nokia.com> --------- Signed-off-by: Liav Weiss (EXT-Nokia) <liav.weiss.ext@nokia.com> Co-authored-by: Liav Weiss (EXT-Nokia) <liav.weiss.ext@nokia.com> Signed-off-by: CI Bot <mkoushni@redhat.com>
1 parent 6216ab0 commit 983abae

File tree

4 files changed

+215
-60
lines changed

4 files changed

+215
-60
lines changed

‎workspaces/frontend/package-lock.json‎

Lines changed: 104 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎workspaces/frontend/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,13 @@
9494
"webpack-merge": "^5.10.0"
9595
},
9696
"dependencies": {
97+
"@patternfly/react-code-editor": "^6.0.0",
9798
"@patternfly/react-core": "^6.0.0",
9899
"@patternfly/react-icons": "^6.0.0",
99100
"@patternfly/react-styles": "^6.0.0",
100101
"@patternfly/react-table": "^6.0.0",
102+
"@types/js-yaml": "^4.0.9",
103+
"js-yaml": "^4.1.0",
101104
"npm-run-all": "^4.1.5",
102105
"react": "^18",
103106
"react-dom": "^18",

‎workspaces/frontend/src/app/pages/Workspaces/Details/WorkspaceDetails.tsx‎

Lines changed: 67 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { Workspace } from '~/shared/types';
1616
import { WorkspaceDetailsOverview } from '~/app/pages/Workspaces/Details/WorkspaceDetailsOverview';
1717
import { WorkspaceDetailsActions } from '~/app/pages/Workspaces/Details/WorkspaceDetailsActions';
1818
import { WorkspaceDetailsActivity } from '~/app/pages/Workspaces/Details/WorkspaceDetailsActivity';
19+
import { WorkspaceDetailsPodTemplate } from '~/app/pages/Workspaces/Details/WorkspaceDetailsPodTemplate';
1920

2021
type WorkspaceDetailsProps = {
2122
workspace: Workspace;
@@ -48,43 +49,85 @@ export const WorkspaceDetails: React.FunctionComponent<WorkspaceDetailsProps> =
4849
<DrawerCloseButton onClick={onCloseClick} />
4950
</DrawerActions>
5051
</DrawerHead>
52+
5153
<DrawerPanelBody>
5254
<Tabs activeKey={activeTabKey} onSelect={handleTabClick}>
53-
<Tab eventKey={0} title={<TabTitleText>Overview</TabTitleText>} aria-label="Overview">
54-
<TabContent id="overviewSectionBodyPadding">
55-
<TabContentBody hasPadding>
56-
<WorkspaceDetailsOverview workspace={workspace} />
57-
</TabContentBody>
58-
</TabContent>
59-
</Tab>
55+
<Tab
56+
eventKey={0}
57+
title={<TabTitleText>Overview</TabTitleText>}
58+
tabContentId="overviewTabContent"
59+
aria-label="Overview"
60+
/>
6061
<Tab
6162
eventKey={1}
6263
title={<TabTitleText>Activity</TabTitleText>}
64+
tabContentId="activityTabContent"
6365
aria-label="Activity"
6466
data-testid="activityTab"
65-
>
66-
<TabContent id="activitySectionBodyPadding">
67-
<TabContentBody hasPadding>
68-
<WorkspaceDetailsActivity workspace={workspace} />
69-
</TabContentBody>
70-
</TabContent>
71-
</Tab>
72-
<Tab eventKey={2} title={<TabTitleText>Logs</TabTitleText>} aria-label="Logs">
73-
<TabContent id="logsSectionBodyPadding">
74-
<TabContentBody hasPadding>Logs</TabContentBody>
75-
</TabContent>
76-
</Tab>
67+
/>
68+
<Tab
69+
eventKey={2}
70+
title={<TabTitleText>Logs</TabTitleText>}
71+
tabContentId="logsTabContent"
72+
aria-label="Logs"
73+
/>
7774
<Tab
7875
eventKey={3}
7976
title={<TabTitleText>Pod template</TabTitleText>}
77+
tabContentId="podTemplateTabContent"
8078
aria-label="Pod template"
81-
>
82-
<TabContent id="podTemplateBodyPadding">
83-
<TabContentBody hasPadding>Pod template</TabContentBody>
84-
</TabContent>
85-
</Tab>
79+
/>
8680
</Tabs>
8781
</DrawerPanelBody>
82+
83+
<DrawerPanelBody>
84+
<TabContent
85+
key={0}
86+
eventKey={0}
87+
id="overviewTabContent"
88+
activeKey={activeTabKey}
89+
hidden={activeTabKey !== 0}
90+
>
91+
<TabContentBody hasPadding>
92+
<WorkspaceDetailsOverview workspace={workspace} />
93+
</TabContentBody>
94+
</TabContent>
95+
96+
<TabContent
97+
key={1}
98+
eventKey={1}
99+
id="activityTabContent"
100+
activeKey={activeTabKey}
101+
hidden={activeTabKey !== 1}
102+
>
103+
<TabContentBody hasPadding>
104+
<WorkspaceDetailsActivity workspace={workspace} />
105+
</TabContentBody>
106+
</TabContent>
107+
108+
<TabContent
109+
key={2}
110+
eventKey={2}
111+
id="logsTabContent"
112+
activeKey={activeTabKey}
113+
hidden={activeTabKey !== 2}
114+
>
115+
<TabContentBody hasPadding>Logs</TabContentBody>
116+
</TabContent>
117+
118+
<TabContent
119+
key={3}
120+
style={{ height: '100%' }}
121+
eventKey={3}
122+
id="podTemplateTabContent"
123+
activeKey={activeTabKey}
124+
hidden={activeTabKey !== 3}
125+
>
126+
<TabContentBody style={{ height: '100%' }} hasPadding>
127+
<WorkspaceDetailsPodTemplate />
128+
</TabContentBody>
129+
</TabContent>
130+
</DrawerPanelBody>
88131
</DrawerPanelContent>
89132
);
90133
};

0 commit comments

Comments
 (0)