Skip to content

Commit 62fe489

Browse files
committed
all
1 parent dcd0760 commit 62fe489

File tree

5 files changed

+10
-24
lines changed

5 files changed

+10
-24
lines changed

backend/substitute_ee_code.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [ "$REVERT" == "YES" ]; then
7171
ce_file="${ee_file/${EE_CODE_DIR}/.}"
7272
ce_file="${root_dirpath}/backend/${ce_file}"
7373
if [ "$REVERT_PREVIOUS" == "YES" ]; then
74-
git checkout HEAD@{25} ${ce_file} || true
74+
git checkout HEAD@{50} ${ce_file} || true
7575
else
7676
git restore --staged ${ce_file} || true
7777
git restore ${ce_file} || true
Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
1-
use std::sync::Arc;
2-
31
use axum::Router;
4-
use object_store::ObjectStore;
5-
use windmill_common::error;
62

73
pub fn workspaced_service() -> Router {
84
Router::new()
95
}
10-
11-
pub async fn upload_file_internal(
12-
s3_client: Arc<dyn ObjectStore>,
13-
file_key: &str,
14-
request: axum::extract::Request,
15-
) -> error::Result<()> {
16-
return Err(error::Error::BadRequest(
17-
"upload file internal impl is not open source".to_string(),
18-
));
19-
}

backend/windmill-api/src/scripts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ async fn create_snapshot_script(
332332
while let Some(field) = multipart.next_field().await.unwrap() {
333333
let name = field.name().unwrap().to_string();
334334
let data = field.bytes().await.unwrap();
335-
if name == "preview" {
335+
if name == "script" {
336336
let ns = Some(serde_json::from_slice(&data).map_err(to_anyhow)?);
337337
let (new_hash, ntx) = create_script_internal(
338338
ns.unwrap(),

backend/windmill-common/src/ee.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use crate::ee::LicensePlan::Community;
2-
use serde::Deserialize;
32
use std::sync::Arc;
43
use tokio::sync::RwLock;
54

@@ -19,9 +18,3 @@ pub async fn get_license_plan() -> LicensePlan {
1918
// Implementation is not open source
2019
return Community;
2120
}
22-
23-
#[derive(Deserialize)]
24-
#[serde(untagged)]
25-
pub enum CriticalErrorChannel {}
26-
27-
pub async fn trigger_critical_error_channels(_error_message: String) {}

frontend/src/lib/components/Dev.svelte

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@
195195
} else {
196196
sendUserToast('Bundle received was obsolete, ignoring', true)
197197
}
198+
} else if (event.data.type == 'clipboard') {
199+
sendUserToast('Copied from clipboard: ' + event.data.text, false)
198200
} else if (event.data.type == 'testBundleError') {
199201
sendUserToast(event.data.error, true)
200202
} else if (event.data.type == 'replaceFlow') {
@@ -348,11 +350,16 @@
348350
})
349351
}
350352
351-
function onKeyDown(event: KeyboardEvent) {
353+
async function onKeyDown(event: KeyboardEvent) {
352354
if ((event.ctrlKey || event.metaKey) && event.key == 'Enter') {
353355
event.preventDefault()
354356
runTest()
355357
}
358+
if ((event.ctrlKey || event.metaKey) && event.code === 'KeyC') {
359+
document.execCommand('copy')
360+
} else if ((event.ctrlKey || event.metaKey) && event.code === 'KeyX') {
361+
document.execCommand('cut')
362+
}
356363
}
357364
358365
let lastPath: string | undefined = undefined

0 commit comments

Comments
 (0)