starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-25 00:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Raw apps deployment UI (and merge UI) (#7725)

Browse Source
This commit is contained in:
wendrul
2026-01-28 19:18:39 +01:00
committed by GitHub
parent 82f378bcb4
commit 36dad2c7a2
3 changed files with 151 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-api/openapi.yaml
+9 -6
View File
@@ -7703,16 +7703,19 @@ paths:
schema:
type: boolean
/w/{workspace}/apps/get_data/{version}/{path}:
/w/{workspace}/apps/get_data/v/{secretWithExtension}:
get:
summary: get app by path
summary: get raw app data by
operationId: getRawAppData
tags:
- raw_app
- app
parameters:
- $ref: "#/components/parameters/WorkspaceId"
- $ref: "#/components/parameters/VersionId"
- $ref: "#/components/parameters/ScriptPath"
- name: secretWithExtension
in: path
required: true
schema:
type: string
responses:
"200":
description: app details
@@ -22688,4 +22691,4 @@ components:
required:
- id
- name
- path
- path
frontend/src/lib/components/CompareWorkspaces.svelte
+60 -13
View File
@@ -427,20 +427,67 @@
path: path
})
if (alreadyExists) {
await AppService.updateApp({
workspace: workspaceToDeployTo,
path: path,
requestBody: {
...app
}
})
if (app.raw_app) {
const secret = await AppService.getPublicSecretOfLatestVersionOfApp({
workspace: workspaceFrom,
path: app.path
})
const js = await AppService.getRawAppData({
secretWithExtension: `${secret}.js`,
workspace: workspaceFrom
})
const css = await AppService.getRawAppData({
secretWithExtension: `${secret}.css`,
workspace: workspaceFrom
})
await AppService.updateAppRaw({
workspace: workspaceToDeployTo,
path: path,
formData: {
app,
css,
js
}
})
} else {
await AppService.updateApp({
workspace: workspaceToDeployTo,
path: path,
requestBody: {
...app
}
})
}
} else {
await AppService.createApp({
workspace: workspaceToDeployTo,
requestBody: {
...app
}
})
if (app.raw_app) {
const secret = await AppService.getPublicSecretOfLatestVersionOfApp({
workspace: workspaceFrom,
path: app.path
})
const js = await AppService.getRawAppData({
secretWithExtension: `${secret}.js`,
workspace: workspaceFrom
})
const css = await AppService.getRawAppData({
secretWithExtension: `${secret}.css`,
workspace: workspaceFrom
})
await AppService.createAppRaw({
workspace: workspaceToDeployTo,
formData: {
app,
css,
js
}
})
} else {
await AppService.createApp({
workspace: workspaceToDeployTo,
requestBody: {
...app
}
})
}
}
} else if (kind == 'variable') {
const variable = await VariableService.getVariable({
frontend/src/lib/components/DeployWorkspace.svelte
+82 -22
View File
@@ -34,6 +34,7 @@
import type { App } from './apps/types'
import { getAllGridItems } from './apps/editor/appUtils'
import { isRunnableByPath } from './apps/inputType'
import type { Runnable } from './raw_apps/utils'
const dispatch = createEventDispatcher()
@@ -150,18 +151,30 @@
} else if (kind == 'app') {
const app = await AppService.getAppByPath({ workspace: $workspaceStore!, path })
console.log('app', app)
let appValue = app.value as App
let result: { kind: Kind; path: string }[] = []
getAllGridItems(appValue).forEach((gridItem) => {
const ci = gridItem.data.componentInput
if (ci?.type == 'runnable' && isRunnableByPath(ci.runnable)) {
if (ci.runnable.runType == 'script') {
result.push({ kind: 'script', path: ci.runnable.path })
} else if (ci.runnable.runType == 'flow') {
result.push({ kind: 'flow', path: ci.runnable.path })
if (app.raw_app) {
for (const runnable of Object.values(app.value.runnables as Record<string, Runnable>)) {
if (isRunnableByPath(runnable)) {
if (runnable.runType == 'script') {
result.push({ kind: 'script', path: runnable.path })
} else if (runnable.runType == 'flow') {
result.push({ kind: 'flow', path: runnable.path })
}
}
}
})
} else {
let appValue = app.value as App
getAllGridItems(appValue).forEach((gridItem) => {
const ci = gridItem.data.componentInput
if (ci?.type == 'runnable' && isRunnableByPath(ci.runnable)) {
if (ci.runnable.runType == 'script') {
result.push({ kind: 'script', path: ci.runnable.path })
} else if (ci.runnable.runType == 'flow') {
result.push({ kind: 'flow', path: ci.runnable.path })
}
}
})
}
return result
} else if (kind == 'resource') {
const res = await ResourceService.getResource({ workspace: $workspaceStore!, path })
@@ -344,20 +357,67 @@
path: path
})
if (alreadyExists) {
await AppService.updateApp({
workspace: workspaceToDeployTo!,
path: path,
requestBody: {
...app
}
})
if (app.raw_app) {
const secret = await AppService.getPublicSecretOfLatestVersionOfApp({
workspace: $workspaceStore!,
path: app.path
})
const js = await AppService.getRawAppData({
secretWithExtension: `${secret}.js`,
workspace: $workspaceStore!
})
const css = await AppService.getRawAppData({
secretWithExtension: `${secret}.css`,
workspace: $workspaceStore!
})
await AppService.updateAppRaw({
workspace: workspaceToDeployTo!,
path: path,
formData: {
app,
css,
js
}
})
} else {
await AppService.updateApp({
workspace: workspaceToDeployTo!,
path: path,
requestBody: {
...app
}
})
}
} else {
await AppService.createApp({
workspace: workspaceToDeployTo!,
requestBody: {
...app
}
})
if (app.raw_app) {
const secret = await AppService.getPublicSecretOfLatestVersionOfApp({
workspace: $workspaceStore!,
path: app.path
})
const js = await AppService.getRawAppData({
secretWithExtension: `${secret}.js`,
workspace: $workspaceStore!
})
const css = await AppService.getRawAppData({
secretWithExtension: `${secret}.css`,
workspace: $workspaceStore!
})
await AppService.createAppRaw({
workspace: workspaceToDeployTo!,
formData: {
app,
css,
js
}
})
} else {
await AppService.createApp({
workspace: workspaceToDeployTo!,
requestBody: {
...app
}
})
}
}
} else if (kind == 'variable') {
const variable = await VariableService.getVariable({