Skip to content

Commit ea62090

Browse files
starpitstarpit
committed
feat: frameless window experiment
1 parent 716b65c commit ea62090

File tree

12 files changed

+276
-121
lines changed

12 files changed

+276
-121
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@
8686
"printWidth": 120
8787
},
8888
"devDependencies": {
89-
"@kui-shell/builder": "11.5.0-dev-20220714-155044",
90-
"@kui-shell/proxy": "11.5.0-dev-20220714-155044",
91-
"@kui-shell/react": "11.5.0-dev-20220714-155044",
92-
"@kui-shell/webpack": "11.5.0-dev-20220714-155044",
89+
"@kui-shell/builder": "11.5.0-dev-20220715-170302",
90+
"@kui-shell/proxy": "11.5.0-dev-20220715-170302",
91+
"@kui-shell/react": "11.5.0-dev-20220715-170302",
92+
"@kui-shell/webpack": "11.5.0-dev-20220715-170302",
9393
"@playwright/test": "^1.23.2",
9494
"@types/debug": "^4.1.7",
9595
"@types/node": "14.11.8",
@@ -113,16 +113,16 @@
113113
},
114114
"dependencies": {
115115
"@kui-shell/client": "file:./plugins/plugin-client-default",
116-
"@kui-shell/core": "11.5.0-dev-20220714-155044",
117-
"@kui-shell/plugin-bash-like": "11.5.0-dev-20220714-155044",
118-
"@kui-shell/plugin-client-common": "11.5.0-dev-20220714-155044",
116+
"@kui-shell/core": "11.5.0-dev-20220715-170302",
117+
"@kui-shell/plugin-bash-like": "11.5.0-dev-20220715-170302",
118+
"@kui-shell/plugin-client-common": "11.5.0-dev-20220715-170302",
119119
"@kui-shell/plugin-codeflare": "file:./plugins/plugin-codeflare",
120-
"@kui-shell/plugin-core-support": "11.5.0-dev-20220714-155044",
121-
"@kui-shell/plugin-electron-components": "11.5.0-dev-20220714-155044",
122-
"@kui-shell/plugin-kubectl": "11.5.0-dev-20220714-155044",
120+
"@kui-shell/plugin-core-support": "11.5.0-dev-20220715-170302",
121+
"@kui-shell/plugin-electron-components": "11.5.0-dev-20220715-170302",
122+
"@kui-shell/plugin-kubectl": "11.5.0-dev-20220715-170302",
123123
"@kui-shell/plugin-madwizard": "file:./plugins/plugin-madwizard",
124-
"@kui-shell/plugin-patternfly4-themes": "11.5.0-dev-20220714-155044",
125-
"@kui-shell/plugin-proxy-support": "11.5.0-dev-20220714-155044",
126-
"@kui-shell/plugin-s3": "11.5.0-dev-20220714-155044"
124+
"@kui-shell/plugin-patternfly4-themes": "11.5.0-dev-20220715-170302",
125+
"@kui-shell/plugin-proxy-support": "11.5.0-dev-20220715-170302",
126+
"@kui-shell/plugin-s3": "11.5.0-dev-20220715-170302"
127127
}
128128
}

‎plugins/plugin-client-default/config.d/style.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
2+
"bodyCss": "codeflare",
23
"width": 800,
34
"height": 600,
5+
"frame": false,
6+
"titleBarStyle": "hiddenInset",
47
"defaultTheme": "PatternFly4 Light"
58
}

‎plugins/plugin-client-default/notebooks/hello.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Welcome
2+
title: Hello
33
className: codeflare--welcome-guidebook
44
layout:
55
1:

‎plugins/plugin-client-default/src/index.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import { productTitle } from "@kui-shell/client/config.d/name.json"
2626

2727
import CodeFlareWidget from "./CodeFlareWidget"
2828

29+
import "../web/scss/components/Client.scss"
30+
2931
/**
3032
* We will set this bit when the user dismisses the Welcome to Kui
3133
* tab, so as to avoid opening it again and bothering that user for
@@ -49,12 +51,14 @@ export default function renderMain(props: KuiProps) {
4951
<Kui
5052
noHelp
5153
version={version}
52-
productName={productTitle}
54+
productName={props.title || productTitle}
5355
lightweightTables
5456
noNewTabButton
5557
noNewSplitButton
58+
noTopTabs
59+
guidebooks={false}
5660
{...props}
57-
initialTabTitle="Welcome"
61+
initialTabTitle="Hello"
5862
isPopup={false}
5963
quietExecCommand={false}
6064
commandLine={process.env.RUNNING_KUI_TEST ? undefined : props.commandLine || ["codeflare", "hello"]}

‎plugins/plugin-client-default/web/scss/components/Client.scss‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Copyright 2022 The Kubernetes Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
@import "@kui-shell/plugin-codeflare/web/scss/mixins";
18+
@import "@kui-shell/plugin-client-common/web/scss/components/TopTabStripe/mixins";
19+
20+
@include CodeFlare {
21+
@include KuiHeader {
22+
-webkit-app-region: drag;
23+
}
24+
25+
@include TopTabStripe_Main {
26+
width: 100%;
27+
@include HeaderNameContainer {
28+
width: 100%;
29+
margin: 0;
30+
padding: 0;
31+
&:after {
32+
content: unset;
33+
}
34+
}
35+
}
36+
37+
@include HeaderName {
38+
width: 100%;
39+
justify-content: center;
40+
}
41+
42+
&.os-darwin {
43+
@include KuiHeader {
44+
padding-left: 6em;
45+
}
46+
}
47+
}

‎plugins/plugin-codeflare/src/controller/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ export default function registerCodeflareCommands(registrar: Registrar) {
5050
registrar.listen("/codeflare/hello", (args) => import("./hello").then((_) => _.default(args)), {
5151
needsUI: true,
5252
outputOnly: true,
53+
width: 800,
54+
height: 600,
5355
})
5456

5557
registrar.catchall<KResponse, MadWizardOptions>(

‎plugins/plugin-codeflare/src/controller/run/get.tsx‎ renamed to ‎plugins/plugin-codeflare/src/controller/run/get.ts‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,26 @@
1414
* limitations under the License.
1515
*/
1616

17-
import React from "react"
18-
import { join } from "path"
1917
import { readdir } from "fs"
2018
import { Profiles } from "madwizard"
21-
import { Grid, GridItem, Tile } from "@patternfly/react-core"
22-
import { Arguments, ReactResponse } from "@kui-shell/core"
19+
import { basename, join } from "path"
20+
import { Arguments, Table } from "@kui-shell/core"
21+
22+
import { productName } from "@kui-shell/client/config.d/name.json"
2323

2424
import { width, height } from "../dashboard"
2525
import { getJobDefinition } from "../description"
2626

27-
async function openDashboard(this: Arguments["REPL"], evt: React.MouseEvent<HTMLDivElement>) {
28-
const runDir = evt.currentTarget.getAttribute("data-run-dir")
27+
async function openDashboard(this: Arguments["REPL"], /*evt: React.MouseEvent<HTMLDivElement>*/ runDir: string) {
28+
// const runDir = evt.currentTarget.getAttribute("data-run-dir")
2929
if (runDir) {
3030
const { ipcRenderer } = await import("electron")
3131
ipcRenderer.send(
3232
"synchronous-message",
3333
JSON.stringify({
3434
operation: "new-window",
35-
title: "Dashboard",
35+
title: productName + " Dashboard: " + basename(runDir),
36+
initialTabTitle: "Dashboard",
3637
width,
3738
height,
3839
argv: ["codeflare", "dashboardui", runDir],
@@ -41,10 +42,32 @@ async function openDashboard(this: Arguments["REPL"], evt: React.MouseEvent<HTML
4142
}
4243
}
4344

45+
function capitalize(str: string) {
46+
return str[0].toUpperCase() + str.slice(1)
47+
}
48+
49+
/** TODO: these are specific to Ray */
50+
type Status = "SUCCEEDED" | "STOPPED" | "RUNNING" | "PENDING" | "ERROR"
51+
function statusColor(status: Status) {
52+
switch (status) {
53+
case "SUCCEEDED":
54+
return "green-background"
55+
case "STOPPED":
56+
case "ERROR":
57+
return "red-background"
58+
case "RUNNING":
59+
return "cyan-background"
60+
case "PENDING":
61+
return "yellow-background"
62+
default:
63+
return "gray-background"
64+
}
65+
}
66+
4467
export default async function getProfiles(args: Arguments) {
4568
const onClick = openDashboard.bind(args.REPL)
4669

47-
return new Promise<ReactResponse>((resolve, reject) => {
70+
return new Promise<Table>((resolve, reject) => {
4871
const runsDir = Profiles.guidebookJobDataPath({})
4972
readdir(runsDir, async (err, runs) => {
5073
if (err) {
@@ -63,7 +86,19 @@ export default async function getProfiles(args: Arguments) {
6386
}))
6487
.filter((_) => !!_.info)
6588

66-
resolve({
89+
const table: Table = {
90+
defaultPresentation: "grid",
91+
body: details.map((_) => ({
92+
name: _.jobId,
93+
onclick: () => onClick(_.runDir),
94+
attributes: [
95+
{ key: "STATUS", value: capitalize(_.info.status), tag: "badge", css: statusColor(_.info.status) },
96+
],
97+
})),
98+
}
99+
100+
resolve(table)
101+
/* resolve({
67102
react: (
68103
<Grid span={1} className="codeflare--grid codeflare--mini">
69104
{details.map((_) => (
@@ -80,7 +115,7 @@ export default async function getProfiles(args: Arguments) {
80115
))}
81116
</Grid>
82117
),
83-
})
118+
}) */
84119
}
85120
})
86121
})

‎plugins/plugin-codeflare/web/scss/_mixins.scss‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright 2022 The Kubernetes Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
@mixin CodeFlare {
18+
body.codeflare {
19+
@content;
20+
}
21+
}

‎plugins/plugin-codeflare/web/scss/components/Hello/Grid.scss‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2022 The Kubernetes Authors
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
@import "../../mixins";
18+
@import "@kui-shell/plugin-client-common/web/scss/components/Table/mixins";
19+
20+
/** TODO should these be wrapped around a .Hello somehow? */
21+
22+
@include CodeFlare {
23+
@include Table {
24+
background: none;
25+
}
26+
27+
@include TableCard {
28+
background: none;
29+
box-shadow: none;
30+
}
31+
32+
@include Grid {
33+
padding: 1em;
34+
}
35+
}

0 commit comments

Comments
 (0)