fix: restore codeflare db -a`

Author: starpit

package-lock.json

@@ -30,13 +30,13 @@
     "@types/split2": "^3.2.1"
   },
   "dependencies": {
-    "@guidebooks/store": "^2.3.1",
+    "@guidebooks/store": "^2.3.2",
     "@logdna/tail-file": "^3.0.1",
     "@patternfly/react-charts": "^6.94.18",
     "@patternfly/react-core": "^4.276.6",
     "asciinema-player": "^3.0.1",
     "chokidar": "^3.5.3",
-    "madwizard": "^5.2.6",
+    "madwizard": "^5.2.7",
     "needle": "^3.2.0",
     "open": "^8.4.0",
     "pretty-bytes": "^6.0.0",

plugins/plugin-codeflare/package.json

@@ -35,7 +35,7 @@ const Description = (props: Props) => {
   const { summaryData } = props
 
   return (
-    <DescriptionList isAutoColumnWidths isFluid>
+    <DescriptionList>
       {summaryData.map(({ label, value }, index) => (
         <DescriptionListGroup key={index}>
           <DescriptionListTerm>{label}</DescriptionListTerm>

plugins/plugin-codeflare/src/components/Description.tsx

@@ -56,12 +56,13 @@ export async function attach(
     process.env.JOB_ID = jobId
   }
 
+  const appName = "codeflare"
   const options: MadWizardOptions = Object.assign(
     {
+      appName,
       profile,
       interactive: false,
       verbose: true,
-      store: process.env.GUIDEBOOK_STORE,
     },
     opts
   )
@@ -74,7 +75,7 @@ export async function attach(
     const deployOptions = Object.assign({}, options, { name: "log-aggregator-deploy" })
     debug("Deploying log aggregator", deployGuidebook, deployOptions)
     stderr("Deploying log aggregator...\n")
-    await guide(["codeflare", "guide", deployGuidebook], undefined, deployOptions)
+    await guide([appName, "guide", deployGuidebook], undefined, deployOptions)
     debug("deploying log aggregator: done")
   } catch (err) {
     console.error("Error attaching", err)
@@ -84,7 +85,7 @@ export async function attach(
   debug("attaching to", jobId)
   stderr("Attaching to job...\n")
   const resp = await guide(
-    ["codeflare", "guide", startGuidebook],
+    [appName, "guide", startGuidebook],
     undefined,
     Object.assign({}, options, { name: "log-aggregator-start", clean: false })
   )
@@ -111,13 +112,12 @@ export async function attach(
  * @return the local logdir for the run
  */
 export default async function attachCommand(args: Arguments<Options>) {
-  const Profiles = await import("madwizard").then((_) => _.Profiles)
-
   const jobId = args.parsedOptions.a
-  const profile = args.parsedOptions.p || (await Profiles.lastUsed())
+  const store = args.parsedOptions.s || process.env.GUIDEBOOK_STORE
+  const profile = args.parsedOptions.p || (await import("madwizard").then((_) => _.Profiles.lastUsed()))
 
   const stderr = await args.createErrorStream()
-  const { logdir, cleanExit } = await attach(profile, jobId, { verbose: args.parsedOptions.V }, stderr)
+  const { logdir, cleanExit } = await attach(profile, jobId, { store, verbose: args.parsedOptions.V }, stderr)
 
   if (logdir) {
     if (cleanExit) {

plugins/plugin-codeflare/src/controller/attach.ts

@@ -31,11 +31,14 @@ export type DashboardOptions = FollowOptions & {
 
   p: string
   profile: string
+
+  s: string
+  store: string
 }
 
 export const followFlags: CommandOptions["flags"] = {
   boolean: ["f", "follow", "i", "y", "V"],
-  alias: { follow: ["f"], attach: ["a"], profile: ["p"] },
+  alias: { follow: ["f"], attach: ["a"], profile: ["p"], store: ["s"] },
 }
 
 async function dashboardcli(args: Arguments<DashboardOptions>) {

plugins/plugin-codeflare/src/controller/dashboard.ts

@@ -45,7 +45,7 @@ export default function registerCodeflareCommands(registrar: Registrar) {
   registrar.listen<KResponse, AttachOptions>(
     "/codeflare/attach",
     (args) => import("./attach").then((_) => _.default(args)),
-    { flags: { boolean: ["wait"] } }
+    { flags: Object.assign({}, flags, { boolean: ["wait"].concat(flags.boolean) }) }
   )
 
   registrar.listen("/codeflare/version", (args) =>

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

@@ -17,8 +17,13 @@
 @import "@kui-shell/plugin-client-common/web/scss/components/Terminal/mixins";
 
 @include Scrollback {
+  .pf-c-content dl {
+    grid-template: unset;
+    grid-template-columns: 1fr;
+  }
   dd {
     margin: 0;
+    grid-column: unset;
   }
   .pf-c-description-list__description {
     font-weight: 300;