-

Author: Armaldio

apps/cli/src/commands/pipelines.ts

@@ -1,4 +1,4 @@
-import { PipelabContext, setupConfigFile, deleteConfigFile } from "@pipelab/core-node";
+import { PipelabContext, setupProjectsConfigFile, deletePipelineConfigFileByName } from "@pipelab/core-node";
 import { FileRepo, SaveLocation } from "@pipelab/shared";
 import { readFile, unlink, readdir } from "node:fs/promises";
 import { getDefaultUserDataPath } from "../paths";
@@ -9,7 +9,7 @@ export async function listPipelinesCommand(options: { userData?: string }) {
   const context = new PipelabContext({ userDataPath });
 
   try {
-    const projectsConfig = await setupConfigFile<FileRepo>("projects", { context });
+    const projectsConfig = await setupProjectsConfigFile(context);
     const repo = await projectsConfig.getConfig();
 
     if (!repo.pipelines || repo.pipelines.length === 0) {
@@ -73,7 +73,7 @@ export async function showPipelineCommand(
   const context = new PipelabContext({ userDataPath });
 
   try {
-    const projectsConfig = await setupConfigFile<FileRepo>("projects", { context });
+    const projectsConfig = await setupProjectsConfigFile(context);
     const repo = await projectsConfig.getConfig();
 
     const pipeline = repo.pipelines?.find(
@@ -217,7 +217,7 @@ export async function deletePipelineCommand(
   const context = new PipelabContext({ userDataPath });
 
   try {
-    const projectsConfig = await setupConfigFile<FileRepo>("projects", { context });
+    const projectsConfig = await setupProjectsConfigFile(context);
     const repo = await projectsConfig.getConfig();
 
     if (!repo.pipelines) {
@@ -239,12 +239,10 @@ export async function deletePipelineCommand(
     // 1. Delete internal file if applicable
     if (pipeline.type === "internal") {
       try {
-        await deleteConfigFile(pipeline.configName, context);
+        await deletePipelineConfigFileByName(pipeline.configName, context);
         console.log(`Deleted pipeline file: ${pipeline.configName}.json`);
       } catch (e: any) {
-        if (e.code !== "ENOENT") {
-          console.warn(`Warning: Could not delete pipeline file: ${e.message}`);
-        }
+        console.warn(`Warning: Could not delete pipeline file: ${e.message}`);
       }
     }
 

apps/cli/src/commands/setup.ts

@@ -1,7 +1,7 @@
 import * as p from "@clack/prompts";
 import { setTimeout } from "node:timers/promises";
 import { PipelabContext } from "@pipelab/core-node";
-import { setupConfigFile } from "@pipelab/core-node";
+import { setupSettingsConfigFile } from "@pipelab/core-node";
 import { AppConfig } from "@pipelab/shared";
 import { getDefaultUserDataPath } from "../paths";
 
@@ -43,7 +43,7 @@ export async function setupCommand(options: { userData?: string }) {
   }
 
   // 2. Configuration
-  const settings = await setupConfigFile<AppConfig>("settings", { context });
+  const settings = await setupSettingsConfigFile(context);
   const config = await settings.getConfig();
 
   const configChanges = await p.group({

apps/ui/src/App.vue

@@ -28,6 +28,7 @@
     </transition>
     <DevBenefitsOverride v-if="!isDisconnected" />
     <WebFilePicker v-if="!isDisconnected" />
+    <MigrationModal v-if="isMigrationModalVisible" v-model:visible="isMigrationModalVisible" />
     <Toast />
   </div>
 </template>
@@ -50,6 +51,8 @@ import DevBenefitsOverride from "./components/DevBenefitsOverride.vue";
 import WebFilePicker from "./components/WebFilePicker.vue";
 import Dialog from "primevue/dialog";
 import Toast from "primevue/toast";
+import MigrationModal from "./components/MigrationModal.vue";
+import { useAPI } from "./composables/api";
 import { websocketManager } from "./composables/websocket-manager";
 import { useWebSocketAPI } from "./composables/websocket-client";
 
@@ -73,6 +76,12 @@ const isServerReady = ref(false);
 const isUpgradeDialogVisible = ref(false);
 const minimumLoadingTimeReached = ref(false);
 
+const isMigrationModalVisible = ref(false);
+const openMigrationModal = () => {
+  isMigrationModalVisible.value = true;
+};
+provide("openMigrationModal", openMigrationModal);
+
 const isDisconnected = computed(
   () =>
     isInitialized.value &&
@@ -241,14 +250,16 @@ onMounted(async () => {
 
 <style lang="scss">
 .app,
-.layout,
-.content {
+.layout {
   height: 100%;
   overflow: hidden;
 }
 
 .content {
   display: flex;
+  position: relative;
+  flex: 1;
+  min-height: 0;
 
   .main {
     flex: 1;