Skip to content

fix: save codemirror content to extra textarea #32893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eladkal merged 2 commits into from
Aug 1, 2023
Merged

fix: save codemirror content to extra textarea #32893

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da71ae
fix: save codemirror content to textarea
genehynson Jul 27, 2023
5675ef6
fix: variable name conflict
genehynson Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions airflow/www/static/js/connection_form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,21 @@ $(document).ready(() => {
$("form#model_form div.well.well-sm button:submit")
);

// Change conn.extra TextArea widget to CodeMirror
const textArea = document.getElementById("extra");
const editor = CodeMirror.fromTextArea(textArea, {
mode: { name: "javascript", json: true },
gutters: ["CodeMirror-lint-markers"],
lineWrapping: true,
lint: true,
});

// beautify JSON
const jsonData = editor.getValue();
const parsedData = JSON.parse(jsonData);
const formattedData = JSON.stringify(parsedData, null, 2);
editor.setValue(formattedData);

/**
* Changes the connection type.
* @param {string} connType The connection type to change to.
Expand Down Expand Up @@ -296,6 +311,8 @@ $(document).ready(() => {
// payload.
if (this.name === "extra") {
let extra;
// save the contents of the CodeMirror editor to the textArea
editor.save();
try {
extra = JSON.parse(this.value);
} catch (e) {
Expand Down Expand Up @@ -353,19 +370,4 @@ $(document).ready(() => {

// Initialize the form by setting a connection type.
changeConnType(connTypeElem.value);

// Change conn.extra TextArea widget to CodeMirror
const textArea = document.getElementById("extra");
const editor = CodeMirror.fromTextArea(textArea, {
mode: { name: "javascript", json: true },
gutters: ["CodeMirror-lint-markers"],
lineWrapping: true,
lint: true,
});

// beautify JSON
const jsonData = editor.getValue();
const data = JSON.parse(jsonData);
const formattedData = JSON.stringify(data, null, 2);
editor.setValue(formattedData);
});