windmill-cli 1.763.1-gitsync.0 → 1.764.0

package/esm/main.js

@@ -17354,7 +17354,6 @@ __export(exports_services_gen, {
   listDataTables: () => listDataTables,
   listDataTableTables: () => listDataTableTables,
   listDataTableSchemas: () => listDataTableSchemas,
-  listDataMetrics: () => listDataMetrics,
   listCustomInstanceDbs: () => listCustomInstanceDbs,
   listConversationMessages: () => listConversationMessages,
   listContextualVariables: () => listContextualVariables,
@@ -19214,23 +19213,6 @@ var backendVersion = () => {
       workspace: data3.workspace
     }
   });
-}, listDataMetrics = (data3) => {
-  return request(OpenAPI, {
-    method: "GET",
-    url: "/w/{workspace}/data_metrics/list",
-    path: {
-      workspace: data3.workspace
-    },
-    query: {
-      table: data3.table,
-      path_prefix: data3.pathPrefix,
-      per_page: data3.perPage,
-      cursor_table: data3.cursorTable,
-      cursor_kind: data3.cursorKind,
-      cursor_name: data3.cursorName,
-      cursor_script: data3.cursorScript
-    }
-  });
 }, listDataTables = (data3) => {
   return request(OpenAPI, {
     method: "GET",
@@ -26111,7 +26093,6 @@ __export(exports_gen, {
   listDataTables: () => listDataTables,
   listDataTableTables: () => listDataTableTables,
   listDataTableSchemas: () => listDataTableSchemas,
-  listDataMetrics: () => listDataMetrics,
   listCustomInstanceDbs: () => listCustomInstanceDbs,
   listConversationMessages: () => listConversationMessages,
   listContextualVariables: () => listContextualVariables,
@@ -26699,7 +26680,7 @@ var init_auth = __esm(async () => {
 });
 
 // src/core/constants.ts
-var WM_FORK_PREFIX = "wm-fork", VERSION = "1.763.1-gitsync.0";
+var WM_FORK_PREFIX = "wm-fork", VERSION = "1.764.0";
 
 // src/utils/git.ts
 var exports_git = {};
@@ -26800,20 +26781,18 @@ function computeGitSyncDeployBranch(params) {
     groupByFolder,
     clonedBranchName
   } = params;
-  const isDevWorkspace = !!devWorkspaceLabel;
-  if (isForkWorkspace(workspaceId, parentWorkspaceId) && !(isDevWorkspace && useIndividualBranch)) {
+  if (isForkWorkspace(workspaceId, parentWorkspaceId)) {
     return forkBranchName(workspaceId, clonedBranchName, devWorkspaceLabel);
   }
-  const fallback = isDevWorkspace ? forkBranchName(workspaceId, clonedBranchName, devWorkspaceLabel) : null;
   if (items.length === 0)
-    return fallback;
+    return null;
   const first = items[0];
   if (!useIndividualBranch || first.path_type === "user" || first.path_type === "group") {
-    return fallback;
+    return null;
   }
-  const ref = first.path || first.parent_path;
+  const ref = first.path ?? first.parent_path;
   if (!ref)
-    return fallback;
+    return null;
   return groupByFolder ? `wm_deploy/${workspaceId}/${ref.split("/").slice(0, 2).join("__")}` : `wm_deploy/${workspaceId}/${first.path_type}/${ref.replaceAll("/", "__")}`;
 }
 function composeGitSyncCommitHeader(items) {
@@ -49223,7 +49202,7 @@ var require_zipEntries = __commonJS((exports, module) => {
       if (this.centralDirRecords !== this.files.length) {
         if (this.centralDirRecords !== 0 && this.files.length === 0) {
           throw new Error("Corrupted zip or bug: expected " + this.centralDirRecords + " records in central dir, got " + this.files.length);
-        } else {}
+        }
       }
     },
     readEndOfCentral: function() {
@@ -57657,7 +57636,7 @@ var require_loader = __commonJS((exports, module) => {
     var error2 = generateError(state, message);
     if (state.onWarning) {
       state.onWarning.call(null, error2);
-    } else {}
+    }
   }
   var directiveHandlers = {
     YAML: function handleYamlDirective(state, name, args) {
@@ -58195,7 +58174,7 @@ var require_loader = __commonJS((exports, module) => {
       } else if (detectedIndent) {
         sc.value += common3.repeat(`
 `, emptyLines + 1);
-      } else {}
+      }
       detectedIndent = true;
       emptyLines = 0;
       captureStart = state.position;
@@ -69631,9 +69610,8 @@ async function pull(opts) {
     }
     const clonedBranchName = getCurrentGitBranch() ?? "main";
     const targetIsFork = isForkWorkspace(workspace.workspaceId, opts.parentWorkspaceId);
-    const forceOffPromotion = targetIsFork && !opts.devWorkspaceLabel;
-    const useIndividualBranch = forceOffPromotion ? false : !!opts.useIndividualBranch;
-    const groupByFolder = forceOffPromotion ? false : !!opts.groupByFolder;
+    const useIndividualBranch = targetIsFork ? false : !!opts.useIndividualBranch;
+    const groupByFolder = targetIsFork ? false : !!opts.groupByFolder;
     const parentBranch = opts.parentDevWorkspaceLabel ? opts.parentDevWorkspaceLabel : opts.parentWorkspaceId && isForkWorkspace(opts.parentWorkspaceId) ? computeGitSyncDeployBranch({
       workspaceId: opts.parentWorkspaceId,
       items: deployItems,
@@ -69914,7 +69892,7 @@ async function gitDeploy(opts) {
     }
   }
   const isFork = isForkWorkspace(opts.workspace ?? "", opts.parentWorkspaceId);
-  const useIndividualBranch = isFork && !opts.devWorkspaceLabel ? false : !!opts.useIndividualBranch;
+  const useIndividualBranch = isFork ? false : !!opts.useIndividualBranch;
   const includes = deriveGitSyncDeployIncludes(items, useIndividualBranch);
   const promotion = useIndividualBranch && !opts.promotion ? getCurrentGitBranch() ?? undefined : opts.promotion;
   await pull({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.763.1-gitsync.0",
+  "version": "1.764.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",