+
@@ -12,4 +13,8 @@
overflow-y: auto;
overflow-x: auto;
}
+
+ div.isFlex {
+ display: flex;
+ }
diff --git a/packages/web/src/elements/SearchInput.svelte b/packages/web/src/elements/SearchInput.svelte
index da5afed8e..94524bf76 100644
--- a/packages/web/src/elements/SearchInput.svelte
+++ b/packages/web/src/elements/SearchInput.svelte
@@ -36,6 +36,7 @@
input {
flex: 1;
min-width: 10px;
+ min-height: 22px;
width: 10px;
border: none;
}
diff --git a/packages/web/src/forms/TemplatedCheckboxField.svelte b/packages/web/src/forms/TemplatedCheckboxField.svelte
new file mode 100644
index 000000000..a6d96f73d
--- /dev/null
+++ b/packages/web/src/forms/TemplatedCheckboxField.svelte
@@ -0,0 +1,36 @@
+
+
+
{
+ dispatch('change', !refInput.checked);
+ },
+ }}
+>
+
+
diff --git a/packages/web/src/icons/FontIcon.svelte b/packages/web/src/icons/FontIcon.svelte
index c7ac644d5..7e3fbb811 100644
--- a/packages/web/src/icons/FontIcon.svelte
+++ b/packages/web/src/icons/FontIcon.svelte
@@ -94,6 +94,9 @@
'icon add': 'mdi mdi-plus-circle',
'icon json': 'mdi mdi-code-json',
'icon lock': 'mdi mdi-lock',
+ 'icon custom-join': 'mdi mdi-arrow-left-right-bold',
+ 'icon parent-filter': 'mdi mdi-home-alert',
+ 'icon parent-filter-outline': 'mdi mdi-home-alert-outline',
'icon run': 'mdi mdi-play',
'icon chevron-down': 'mdi mdi-chevron-down',
@@ -120,6 +123,7 @@
'img warn': 'mdi mdi-alert color-icon-gold',
'img info': 'mdi mdi-information color-icon-blue',
// 'img statusbar-ok': 'mdi mdi-check-circle color-on-statusbar-green',
+ 'img circular': 'mdi mdi-circular-saw color-icon-red',
'img archive': 'mdi mdi-table color-icon-gold',
'img archive-folder': 'mdi mdi-database-outline color-icon-green',
@@ -171,6 +175,8 @@
'img link': 'mdi mdi-link',
'img filter': 'mdi mdi-filter',
'img group': 'mdi mdi-group',
+ 'img perspective': 'mdi mdi-eye color-icon-yellow',
+ 'img parent-filter': 'mdi mdi-home-alert color-icon-yellow',
'img folder': 'mdi mdi-folder color-icon-yellow',
'img type-string': 'mdi mdi-alphabetical color-icon-blue',
diff --git a/packages/web/src/impexp/FormConnectionSelect.svelte b/packages/web/src/impexp/FormConnectionSelect.svelte
index c87d144c4..0f71c9925 100644
--- a/packages/web/src/impexp/FormConnectionSelect.svelte
+++ b/packages/web/src/impexp/FormConnectionSelect.svelte
@@ -12,7 +12,7 @@
...(allowChooseModel ? [{ label: '(DB Model)', value: '__model' }] : []),
..._.sortBy(
($connections || [])
- .filter(conn => (direction == 'target' ? !conn.isReadOnly : true))
+ .filter(conn => !conn.unsaved && (direction == 'target' ? !conn.isReadOnly : true))
.map(conn => ({
value: conn._id,
label: getConnectionLabel(conn),
diff --git a/packages/web/src/jsontree/JSONObjectNode.svelte b/packages/web/src/jsontree/JSONObjectNode.svelte
index c818dc51f..4bb2c1e6d 100644
--- a/packages/web/src/jsontree/JSONObjectNode.svelte
+++ b/packages/web/src/jsontree/JSONObjectNode.svelte
@@ -23,4 +23,5 @@
label={labelOverride || `${nodeType} `}
bracketOpen={'{'}
bracketClose={'}'}
+ elementValue={value}
/>
diff --git a/packages/web/src/jsontree/JSONTree.svelte b/packages/web/src/jsontree/JSONTree.svelte
index 89abfcfdd..ee031f95d 100644
--- a/packages/web/src/jsontree/JSONTree.svelte
+++ b/packages/web/src/jsontree/JSONTree.svelte
@@ -4,6 +4,7 @@
import contextMenu, { getContextMenu } from '../utility/contextMenu';
import openNewTab from '../utility/openNewTab';
import _ from 'lodash';
+ import { copyTextToClipboard } from '../utility/clipboard';
setContext('json-tree-context-key', {});
@@ -34,8 +35,17 @@
if (!closest) return;
const value = elementData.get(closest);
+ const res = [];
+
+ res.push({
+ text: 'Copy JSON',
+ onClick: () => {
+ copyTextToClipboard(JSON.stringify(value, null, 2));
+ },
+ });
+
if (value && _.isArray(value)) {
- return {
+ res.push({
text: 'Open as data sheet',
onClick: () => {
openNewTab(
@@ -53,8 +63,9 @@
}
);
},
- };
+ });
}
+ return res;
}
diff --git a/packages/web/src/modals/ConfirmNoSqlModal.svelte b/packages/web/src/modals/ConfirmNoSqlModal.svelte
index c288200b0..fdabe8f6a 100644
--- a/packages/web/src/modals/ConfirmNoSqlModal.svelte
+++ b/packages/web/src/modals/ConfirmNoSqlModal.svelte
@@ -2,15 +2,19 @@
import FormStyledButton from '../buttons/FormStyledButton.svelte';
import FormProvider from '../forms/FormProvider.svelte';
import FormSubmit from '../forms/FormSubmit.svelte';
- import JSONTree from '../jsontree/JSONTree.svelte';
+ import TemplatedCheckboxField from '../forms/TemplatedCheckboxField.svelte';
import AceEditor from '../query/AceEditor.svelte';
-import newQuery from '../query/newQuery';
+ import newQuery from '../query/newQuery';
+ import { apiCall } from '../utility/api';
import ModalBase from './ModalBase.svelte';
import { closeCurrentModal } from './modalTools';
export let script;
export let onConfirm;
+ export let skipConfirmSettingKey = null;
+
+ let dontAskAgain;
@@ -21,6 +25,20 @@ import newQuery from '../query/newQuery';