Compare commits

...
2 Commits
4 changed files with 62 additions and 12 deletions
+41 -3
View File
@@ -933,16 +933,19 @@ function App() {
: [], : [],
user: actualServiceData.user || "", user: actualServiceData.user || "",
working_dir: actualServiceData.working_dir || "", working_dir: actualServiceData.working_dir || "",
labels: actualServiceData.labels labels: Array.isArray(actualServiceData.labels)
? Array.isArray(actualServiceData.labels)
? actualServiceData.labels.map((l: string) => { ? actualServiceData.labels.map((l: string) => {
const [key, ...rest] = l.split("="); const [key, ...rest] = l.split("=");
return { key, value: rest.join("=") }; return { key, value: rest.join("=") };
}) })
: Object.entries(actualServiceData.labels).map( : actualServiceData.labels && typeof actualServiceData.labels === "object"
? Object.entries(actualServiceData.labels).map(
([key, value]: [string, any]) => ({ key, value: String(value) }) ([key, value]: [string, any]) => ({ key, value: String(value) })
) )
: [], : [],
labels_syntax: Array.isArray(actualServiceData.labels)
? "array"
: "dict",
privileged: privileged:
actualServiceData.privileged !== undefined actualServiceData.privileged !== undefined
? !!actualServiceData.privileged ? !!actualServiceData.privileged
@@ -3274,7 +3277,42 @@ function App() {
</div> </div>
{/* Labels */} {/* Labels */}
<div> <div>
<div className="flex items-center justify-between mb-1">
<div className="flex items-center gap-2">
<Label className="mb-1 block">Labels</Label> <Label className="mb-1 block">Labels</Label>
</div>
<div className="flex gap-2 items-center">
<span className="text-xs text-muted-foreground">
Syntax:
</span>
<Toggle
pressed={svc.labels_syntax === "array"}
onPressedChange={(pressed) =>
updateServiceField(
"labels_syntax",
pressed ? "array" : "dict"
)
}
aria-label="Array syntax"
className="border rounded px-2 py-1 text-xs"
>
Array
</Toggle>
<Toggle
pressed={svc.labels_syntax === "dict"}
onPressedChange={(pressed) =>
updateServiceField(
"labels_syntax",
pressed ? "dict" : "array"
)
}
aria-label="Dictionary syntax"
className="border rounded px-2 py-1 text-xs"
>
Dict
</Toggle>
</div>
</div>
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
{svc.labels?.map((label, idx) => ( {svc.labels?.map((label, idx) => (
<div <div
+1
View File
@@ -58,6 +58,7 @@ export interface ServiceConfig {
user?: string; user?: string;
working_dir?: string; working_dir?: string;
labels?: { key: string; value: string }[]; labels?: { key: string; value: string }[];
labels_syntax?: "array" | "dict";
privileged?: boolean; privileged?: boolean;
read_only?: boolean; read_only?: boolean;
shm_size?: string; shm_size?: string;
+1
View File
@@ -115,6 +115,7 @@ export function defaultService(): ServiceConfig {
user: "", user: "",
working_dir: "", working_dir: "",
labels: [], labels: [],
labels_syntax: "array",
privileged: undefined, privileged: undefined,
read_only: undefined, read_only: undefined,
shm_size: "", shm_size: "",
+10
View File
@@ -186,7 +186,17 @@ export function generateYaml(
working_dir: svc.working_dir || undefined, working_dir: svc.working_dir || undefined,
labels: labels:
svc.labels && svc.labels.filter((l) => l.key).length svc.labels && svc.labels.filter((l) => l.key).length
? svc.labels_syntax === "dict"
? svc.labels ? svc.labels
.filter(({ key }) => key)
.reduce(
(acc, { key, value }) => {
acc[key] = value;
return acc;
},
{} as Record<string, string>
)
: svc.labels
.filter((l) => l.key) .filter((l) => l.key)
.map(({ key, value}) => `"${key}=${value}"`) .map(({ key, value}) => `"${key}=${value}"`)
:undefined, :undefined,