deploy 2.0.1-dev-2

Cargo.lock

@@ -1149,7 +1149,7 @@ dependencies = [
 
 [[package]]
 name = "command"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "komodo_client",
  "shlex",
@@ -1489,7 +1489,7 @@ checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
 [[package]]
 name = "database"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -1759,7 +1759,7 @@ dependencies = [
 
 [[package]]
 name = "encoding"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1801,7 +1801,7 @@ dependencies = [
 
 [[package]]
 name = "environment"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "formatting",
@@ -1930,7 +1930,7 @@ dependencies = [
 
 [[package]]
 name = "formatting"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "mogh_error",
 ]
@@ -2109,7 +2109,7 @@ dependencies = [
 
 [[package]]
 name = "git"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "command",
@@ -2709,7 +2709,7 @@ dependencies = [
 
 [[package]]
 name = "interpolate"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "komodo_client",
@@ -2835,7 +2835,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_cli"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "bcrypt",
@@ -2865,7 +2865,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_client"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -2904,7 +2904,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_core"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2977,7 +2977,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_periphery"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -4032,7 +4032,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "periphery_client"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "encoding",
@@ -5997,7 +5997,7 @@ dependencies = [
 
 [[package]]
 name = "transport"
-version = "2.0.0"
+version = "2.0.1-dev-2"
 dependencies = [
  "anyhow",
  "axum",

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 ]
 
 [workspace.package]
-version = "2.0.0"
+version = "2.0.1-dev-2"
 edition = "2024"
 authors = ["mbecker20 <becker.maxh@gmail.com>"]
 license = "GPL-3.0-or-later"

bin/core/src/sync/file.rs

@@ -243,36 +243,27 @@ pub fn extend_resources(
   more: ResourcesToml,
   match_tags: &[String],
 ) {
-  resources
-    .servers
-    .extend(filter_by_tag(more.servers, match_tags));
-  resources
-    .stacks
-    .extend(filter_by_tag(more.stacks, match_tags));
-  resources
-    .deployments
-    .extend(filter_by_tag(more.deployments, match_tags));
-  resources
-    .builds
-    .extend(filter_by_tag(more.builds, match_tags));
-  resources
-    .repos
-    .extend(filter_by_tag(more.repos, match_tags));
-  resources
-    .procedures
-    .extend(filter_by_tag(more.procedures, match_tags));
-  resources
-    .actions
-    .extend(filter_by_tag(more.actions, match_tags));
-  resources
-    .alerters
-    .extend(filter_by_tag(more.alerters, match_tags));
-  resources
-    .builders
-    .extend(filter_by_tag(more.builders, match_tags));
-  resources
-    .resource_syncs
-    .extend(filter_by_tag(more.resource_syncs, match_tags));
+  macro_rules! extend_filtered {
+    ($($field:ident),* $(,)?) => {
+      $(
+        resources.$field.extend(filter_by_tag(more.$field, match_tags));
+      )*
+    };
+  }
+  // New resource types need to be added here manually.
+  extend_filtered!(
+    servers,
+    swarms,
+    stacks,
+    deployments,
+    builds,
+    repos,
+    procedures,
+    actions,
+    alerters,
+    builders,
+    resource_syncs,
+  );
   resources.user_groups.extend(more.user_groups);
   resources.variables.extend(more.variables);
 }

client/core/ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "komodo_client",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Komodo client package",
   "homepage": "https://komo.do",
   "main": "dist/lib.js",
@@ -16,7 +16,7 @@
     "mogh_auth_client": "^1.2.1"
   },
   "devDependencies": {
-    "typescript": "^5.6.3"
+    "typescript": "^6.0.2"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

client/core/ts/tsconfig.json

@@ -3,10 +3,11 @@
 		"strict": true,
 		"target": "ESNext",
 		"module": "ESNext",
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"allowSyntheticDefaultImports": true,
 		"esModuleInterop": true,
 		"isolatedModules": true,
+		"rootDir": "src/",
 		"outDir": "dist",
 		"declaration": true
 	}

client/core/ts/yarn.lock

@@ -14,7 +14,7 @@ mogh_auth_client@^1.2.1:
   dependencies:
     jwt-decode "^4.0.0"
 
-typescript@^5.6.3:
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
-  integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
+typescript@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.2.tgz#0b1bfb15f68c64b97032f3d78abbf98bdbba501f"
+  integrity sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==

ui/package.json

@@ -24,7 +24,7 @@
     "jotai": "^2.18.0",
     "jotai-family": "^1.0.1",
     "jotai-location": "^0.6.2",
-    "lucide-react": "^0.575.0",
+    "lucide-react": "^1.6.0",
     "monaco-editor": "^0.55.1",
     "monaco-yaml": "^5.4.1",
     "react": "^19.2.4",
@@ -42,13 +42,14 @@
     "@types/react-dom": "^19.2.3",
     "@types/sanitize-html": "^2.16.0",
     "@types/shell-quote": "^1.7.5",
-    "@vitejs/plugin-react": "^5.1.4",
+    "@vitejs/plugin-react": "^6.0.1",
     "dotenv": "^17.3.1",
     "postcss": "^8.5.6",
     "postcss-preset-mantine": "^1.18.0",
     "postcss-simple-vars": "^7.0.1",
     "sass-embedded": "^1.97.3",
-    "typescript": "^5.9.3",
-    "vite": "^7.3.1"
-  }
+    "typescript": "^6.0.2",
+    "vite": "^8.0.2"
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

ui/src/resources/procedure/config/executions.tsx

@@ -772,7 +772,7 @@ export const PROCEDURE_EXECUTIONS: ProcedureExecutions = {
               <Stack gap="0">
                 <Text>Command</Text>
                 <TextInput
-                  placeholder="Enter command (Required)"
+                  placeholder="Enter command (Optional)"
                   value={commandText}
                   onChange={(e) => setCommand(e.target.value)}
                   disabled={disabled}

ui/src/resources/swarm/config.tsx

@@ -150,10 +150,13 @@ export default function SwarmConfig({
           },
           {
             label: "Links",
-            description: "Add quick links in the resource header",
+            labelHidden: true,
             fields: {
               links: (values, set) => (
                 <ConfigList
+                  label="Links"
+                  addLabel="Add Link"
+                  description="Add quick links in the resource header"
                   field="links"
                   values={values ?? []}
                   set={set}

ui/tsconfig.json

@@ -21,7 +21,6 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
     /* Module resolution */
-    "baseUrl": ".",
     "paths": {
       "@/*": [
         "./src/*"