-
- d.index).distance(160));
+ .force('link', d3.forceLink().id(d => d.id).distance(160));
// disable charge after initial setup
diff --git a/src/app/components/data-view/data-table/data-table.component.html b/src/app/components/data-view/data-table/data-table.component.html
index cca77d42..10e77bff 100644
--- a/src/app/components/data-view/data-table/data-table.component.html
+++ b/src/app/components/data-view/data-table/data-table.component.html
@@ -64,7 +64,7 @@
(enter)="updateTuple()" [attr.data-before]="d2"
[attr.data-col]="$result().header[j].name">
- |
+ |
|
@@ -123,7 +123,7 @@
(valueChange)="inputChange(h.name, $event)"
(enter)="insertTuple()">
-
+ |
diff --git a/src/app/components/data-view/data-table/entity-config.ts b/src/app/components/data-view/data-table/entity-config.ts
index 9eab288a..d3835301 100644
--- a/src/app/components/data-view/data-table/entity-config.ts
+++ b/src/app/components/data-view/data-table/entity-config.ts
@@ -6,4 +6,5 @@ export interface EntityConfig {
search: boolean;
exploring: boolean;
hideCreateView?: boolean;
+ cardRelWidth?: boolean;
}
diff --git a/src/app/components/data-view/data-template/data-template.component.ts b/src/app/components/data-view/data-template/data-template.component.ts
index c522fe49..558fe50d 100644
--- a/src/app/components/data-view/data-template/data-template.component.ts
+++ b/src/app/components/data-view/data-template/data-template.component.ts
@@ -1,17 +1,4 @@
-import {
- Component,
- computed,
- effect,
- EventEmitter,
- inject,
- Input,
- OnDestroy,
- OnInit,
- Signal,
- signal,
- untracked,
- WritableSignal
-} from '@angular/core';
+import {Component, computed, effect, EventEmitter, inject, Input, OnDestroy, OnInit, Signal, signal, untracked, WritableSignal} from '@angular/core';
import {RelationalResult, Result, UiColumnDefinition} from '../models/result-set.model';
import {WebuiSettingsService} from '../../../services/webui-settings.service';
import {CatalogService} from '../../../services/catalog.service';
@@ -65,7 +52,9 @@ export abstract class DataTemplateComponent implements OnInit, OnDestroy {
sort: true,
update: true,
delete: true,
- exploring: false
+ exploring: false,
+ hideCreateView: false,
+ cardRelWidth: false
});
protected readonly currentRoute: WritableSignal = signal(this._route.snapshot.paramMap.get('id'));
protected readonly routeParams = toSignal(this._route.params);
@@ -132,7 +121,7 @@ export abstract class DataTemplateComponent implements OnInit, OnDestroy {
}
ngOnInit() {
- this._sidebar.open();
+ //this._sidebar.open();
//listen to results
this.initWebsocket();
@@ -371,7 +360,7 @@ export abstract class DataTemplateComponent implements OnInit, OnDestroy {
//when double-clicking the delete btn
return;
}
- if (this.entityConfig.update) {
+ if (this.entityConfig().update) {
this.updateValues.clear();
this.$result().data[i].forEach((v, k) => {
if (this.$result().header[k].dataType === 'bool') {
diff --git a/src/app/components/data-view/json-text/json-text.component.html b/src/app/components/data-view/json-text/json-text.component.html
index e565e719..9e2cce34 100644
--- a/src/app/components/data-view/json-text/json-text.component.html
+++ b/src/app/components/data-view/json-text/json-text.component.html
@@ -1,3 +1,3 @@
-
+
diff --git a/src/app/components/data-view/json-text/json-text.component.ts b/src/app/components/data-view/json-text/json-text.component.ts
index 6c918437..dc2e91e1 100644
--- a/src/app/components/data-view/json-text/json-text.component.ts
+++ b/src/app/components/data-view/json-text/json-text.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, computed, input, OnInit, Signal} from '@angular/core';
@Component({
selector: 'app-json-text',
@@ -7,18 +7,22 @@ import {Component, Input, OnInit} from '@angular/core';
})
export class JsonTextComponent implements OnInit {
- @Input() text?: string;
- json: {};
+ text = input();
+ expanded = input(false);
+
+ private readonly regex = new RegExp('/ObjectId(\d{1,24})/g');
+ json: Signal;
constructor() {
}
ngOnInit(): void {
- const regex = new RegExp('/ObjectId(\d{1,24})/g');
- if (regex.test(this.text)) {
- return;
- }
- this.json = this.parse(this.text);
+ this.json = computed(() => {
+ if (this.regex.test(this.text())) {
+ return {};
+ }
+ return this.parse(this.text());
+ });
}
parse(text: string): {} {
diff --git a/src/app/components/editor/editor.component.ts b/src/app/components/editor/editor.component.ts
index 68185d1f..625a0e83 100644
--- a/src/app/components/editor/editor.component.ts
+++ b/src/app/components/editor/editor.component.ts
@@ -6,6 +6,9 @@ import 'ace-builds/src-noconflict/mode-java';
import 'ace-builds/src-noconflict/mode-python';
import 'ace-builds/src-noconflict/mode-markdown';
import 'ace-builds/src-noconflict/mode-pig';
+import 'ace-builds/src-noconflict/mode-json';
+import 'ace-builds/src-noconflict/mode-plain_text';
+import 'ace-builds/src-noconflict/mode-sh';
import 'ace-builds/src-noconflict/theme-tomorrow';
import 'ace-builds/src-noconflict/ext-language_tools';
import {SidebarNode} from '../../models/sidebar-node.model';
@@ -34,7 +37,7 @@ export class EditorComponent implements OnInit, AfterViewInit, OnChanges {
@Input() code ?;
suggestions: string[] = [];
- private readonly supportedLanguages = ['pgsql', 'sql', 'java', 'python', 'markdown', 'pig'];
+ private readonly supportedLanguages = ['pgsql', 'sql', 'java', 'python', 'markdown', 'pig', 'json', 'plain_text', 'sh'];
constructor() {
effect(() => {
@@ -53,7 +56,7 @@ export class EditorComponent implements OnInit, AfterViewInit, OnChanges {
}
ngOnChanges(changes: SimpleChanges): void {
- if (changes.lang && !changes.lang.firstChange) {
+ if (changes.language && !changes.language.firstChange) {
this.updateLanguage();
}
if (changes.autocomplete && !changes.autocomplete.firstChange) {
@@ -123,6 +126,10 @@ export class EditorComponent implements OnInit, AfterViewInit, OnChanges {
}
}
+ insertAtCursor(code: string) {
+ this.codeEditor.session.insert(this.codeEditor.getCursorPosition(), code);
+ }
+
// from: https://stackoverflow.com/questions/30041816/ace-editor-autocomplete-custom-strings
setAutocomplete() {
this.codeEditor.setOptions({enableLiveAutocompletion: true});
@@ -175,7 +182,6 @@ export class EditorComponent implements OnInit, AfterViewInit, OnChanges {
this.codeEditor.getSession().setMode('ace/mode/' + this.language);
} else {
this.codeEditor.getSession().setMode('ace/mode/sql');
-
}
}
diff --git a/src/app/components/json/json-editor.component.ts b/src/app/components/json/json-editor.component.ts
index 5841289f..4dc6d2f7 100644
--- a/src/app/components/json/json-editor.component.ts
+++ b/src/app/components/json/json-editor.component.ts
@@ -146,7 +146,7 @@ export class JsonEditorComponent implements OnInit {
}
} catch (e) {
- console.log('could not translate');
+ console.log('could not translate', e);
}
if (this.empty && this.data.length === 0) {
diff --git a/src/app/components/json/json-elem/json-elem.component.ts b/src/app/components/json/json-elem/json-elem.component.ts
index c79f344b..a6c2ae40 100644
--- a/src/app/components/json/json-elem/json-elem.component.ts
+++ b/src/app/components/json/json-elem/json-elem.component.ts
@@ -1,13 +1,4 @@
-import {
- ChangeDetectionStrategy,
- Component,
- EventEmitter,
- Input,
- OnChanges,
- OnInit,
- Output,
- SimpleChanges,
-} from '@angular/core';
+import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges,} from '@angular/core';
import {Info, Pair, Type} from '../json-editor.component';
@Component({
@@ -44,7 +35,6 @@ export class JsonElemComponent implements OnInit, OnChanges {
childDupStatus = [];
ngOnChanges(changes: SimpleChanges) {
- console.log(changes);
}
ngOnInit(): void {
@@ -176,7 +166,6 @@ export class JsonElemComponent implements OnInit, OnChanges {
return;
}
const keys = (this.el.value as Pair[]).map(e => e.key);
- console.log(keys);
const temp = [];
const copy = keys;
@@ -191,14 +180,10 @@ export class JsonElemComponent implements OnInit, OnChanges {
temp.push(key);
status.push(copy.includes(key));
}
- console.log(copy);
- console.log(temp);
- console.log(status);
count++;
}
this.childDupStatus = status;
- console.log(this.childDupStatus);
}
diff --git a/src/app/components/left-sidebar/left-sidebar.component.ts b/src/app/components/left-sidebar/left-sidebar.component.ts
index adf41f47..69abefca 100644
--- a/src/app/components/left-sidebar/left-sidebar.component.ts
+++ b/src/app/components/left-sidebar/left-sidebar.component.ts
@@ -64,7 +64,7 @@ export class LeftSidebarComponent implements OnInit, AfterViewInit {
}
static readonly EXPAND_SHOWN_ROUTES: String[] = [
- '/views/monitoring', '/views/config', '/views/uml', '/views/querying/console', '/views/notebooks'];
+ '/views/monitoring', '/views/config', '/views/uml', '/views/querying/console', '/views/notebooks', '/views/workflows'];
private readonly _router = inject(Router);
public readonly _sidebar = inject(LeftSidebarService);
diff --git a/src/app/components/polyalg/controls/agg-arg/agg-arg.component.ts b/src/app/components/polyalg/controls/agg-arg/agg-arg.component.ts
index 150804e7..a1e3bcd8 100644
--- a/src/app/components/polyalg/controls/agg-arg/agg-arg.component.ts
+++ b/src/app/components/polyalg/controls/agg-arg/agg-arg.component.ts
@@ -17,7 +17,7 @@ export class AggArgComponent implements OnInit {
constructor(private _registry: PolyAlgService) {
}
- @Input() data: AggControl; // TODO: support multiple args, colls
+ @Input() data: AggControl; // support multiple args, colls in the future
fChoices: string[] = [];
fChoicesSimple = ['AVG', 'COUNT', 'MAX', 'MIN', 'SUM'].sort();
diff --git a/src/app/components/polyalg/controls/string-arg/string-arg.component.ts b/src/app/components/polyalg/controls/string-arg/string-arg.component.ts
index 3c62f795..9c95dd01 100644
--- a/src/app/components/polyalg/controls/string-arg/string-arg.component.ts
+++ b/src/app/components/polyalg/controls/string-arg/string-arg.component.ts
@@ -24,7 +24,7 @@ export class StringControl extends ArgControl {
alias = signal(this.value.alias === this.value.arg ? '' : this.value.alias);
isTrivial = computed(() => {
const hasTrivialAlias = !this.showAlias || !this.alias() || this.alias() === this.arg();
- const hasTrivialArg = !this.arg() || /^[a-zA-Z0-9_$]+$/.test(this.arg()); // TODO: use better way to determine whether arg is trivial
+ const hasTrivialArg = !this.arg() || /^[a-zA-Z0-9_$]+$/.test(this.arg()); // use better way to determine whether arg is trivial?
return hasTrivialAlias && hasTrivialArg;
});
diff --git a/src/app/components/polyalg/polyalg-viewer/alg-editor.ts b/src/app/components/polyalg/polyalg-viewer/alg-editor.ts
index cbeefa5f..35a8944f 100644
--- a/src/app/components/polyalg/polyalg-viewer/alg-editor.ts
+++ b/src/app/components/polyalg/polyalg-viewer/alg-editor.ts
@@ -18,7 +18,14 @@ import {PolyAlgService} from '../polyalg.service';
import {DataflowEngine} from 'rete-engine';
import {Position} from 'rete-angular-plugin/17/types';
import {Subject} from 'rxjs';
-import {canCreateConnection, findRootNodeId, getContextMenuNodes, getMagneticConnectionProps, updateMultiConnAfterCreate, updateMultiConnAfterRemove} from './alg-editor-utils';
+import {
+ canCreateConnection,
+ findRootNodeId,
+ getContextMenuNodes,
+ getMagneticConnectionProps,
+ updateMultiConnAfterCreate,
+ updateMultiConnAfterRemove
+} from './alg-editor-utils';
import {setupPanningBoundary} from './panning-boundary';
import {useMagneticConnection} from './magnetic-connection';
import {MagneticConnectionComponent} from './magnetic-connection/magnetic-connection.component';
@@ -26,6 +33,8 @@ import {AlgMetadata} from '../algnode/alg-metadata/alg-metadata.component';
import {Transform} from 'rete-area-plugin/_types/area';
import {PlanType} from '../../../models/information-page.model';
import {OperatorModel} from '../models/polyalg-registry';
+import {CustomZoom} from './custom-zoom';
+import {CustomDrag} from './custom-drag';
export type Schemes = GetSchemes>;
type AreaExtra = AngularArea2D | ContextMenuExtra;
@@ -126,6 +135,8 @@ export async function createEditor(container: HTMLElement, injector: Injector, r
useMagneticConnection(connection, getMagneticConnectionProps(editor));
}
+ area.area.setZoomHandler(new CustomZoom(0.1, 0.3, true));
+ area.area.setDragHandler(new CustomDrag(container)); // horizontal scrolling
AreaExtensions.simpleNodesOrder(area);
addCustomBackground(area);
AreaExtensions.restrictor(area, {scaling: {min: 0.03, max: 5}}); // Restrict Zoom
diff --git a/src/app/components/polyalg/polyalg-viewer/alg-viewer.component.html b/src/app/components/polyalg/polyalg-viewer/alg-viewer.component.html
index 28e58852..c0e62079 100644
--- a/src/app/components/polyalg/polyalg-viewer/alg-viewer.component.html
+++ b/src/app/components/polyalg/polyalg-viewer/alg-viewer.component.html
@@ -3,11 +3,12 @@
@@ -23,7 +24,8 @@
[readonly]="isReadOnly">
- PolyAlgebra can only be edited in advanced mode.
+ PolyAlgebra can only be edited in
+ advanced mode.
@@ -49,14 +51,18 @@
-
\ No newline at end of file
+
diff --git a/src/app/components/polyalg/polyalg-viewer/custom-drag.ts b/src/app/components/polyalg/polyalg-viewer/custom-drag.ts
new file mode 100644
index 00000000..91946d68
--- /dev/null
+++ b/src/app/components/polyalg/polyalg-viewer/custom-drag.ts
@@ -0,0 +1,28 @@
+import {Drag} from 'rete-area-plugin';
+
+/**
+ * Enables to use horizontal scrolling for moving the area horizontally.
+ */
+export class CustomDrag extends Drag {
+ constructor(private container: HTMLElement) {
+ super();
+
+ this.container.addEventListener('wheel', this.wheel);
+ }
+
+ private wheel = (e: WheelEvent) => {
+ if (e.deltaX === 0) {
+ return;
+ }
+ e.preventDefault();
+ const startPosition = {...this.config.getCurrentPosition()};
+ const zoom = this.config.getZoom();
+ const x = startPosition.x - e.deltaX * 0.75 / zoom;
+ void this.events.translate(x, startPosition.y, null);
+ }
+
+ public destroy() {
+ this.container.removeEventListener('wheel', this.wheel);
+ super.destroy();
+ }
+}
diff --git a/src/app/components/polyalg/polyalg-viewer/custom-zoom.ts b/src/app/components/polyalg/polyalg-viewer/custom-zoom.ts
new file mode 100644
index 00000000..0515c044
--- /dev/null
+++ b/src/app/components/polyalg/polyalg-viewer/custom-zoom.ts
@@ -0,0 +1,97 @@
+import {Zoom} from 'rete-area-plugin';
+import {OnZoom} from 'rete-area-plugin/_types/zoom';
+import {document} from 'ngx-bootstrap/utils';
+import {debounceTime, filter, fromEvent, Subscription} from 'rxjs';
+import {tap} from 'rxjs/operators';
+
+/**
+ * Improves intensity for touchpad zooming and adds the possibility to require CTRL being pressed for the zoom to have an effect.
+ */
+export class CustomZoom extends Zoom {
+ private readonly m: number;
+ private readonly b: number;
+ private overlay: HTMLDivElement = null;
+ private wheelSubscription: Subscription;
+
+ constructor(
+ intensity: number,
+ trackPadIntensity: number = 0.3,
+ private requireCtrl: boolean = false) {
+ super(intensity);
+ this.b = Math.max(0, Math.min(trackPadIntensity, 1));
+ this.m = 1 - this.b;
+ }
+
+
+ initialize(container: HTMLElement, element: HTMLElement, onzoom: OnZoom) {
+ super.initialize(container, element, onzoom);
+ if (this.requireCtrl) {
+ this.initOverlay();
+ this.wheelSubscription = fromEvent(container, 'wheel').pipe(
+ // Only consider the event if Ctrl key is not pressed
+ filter((event) => !event.ctrlKey),
+ tap(() => this.overlay.style.display = 'flex'),
+ debounceTime(1000),
+ tap(() => this.overlay.style.display = 'none')
+ ).subscribe();
+ }
+ }
+
+ protected wheel = (e: WheelEvent) => {
+ if (this.requireCtrl) {
+ if (e.ctrlKey) {
+ this.overlay.style.display = 'none';
+ } else {
+ return;
+ }
+ }
+ e.preventDefault();
+
+ const {left, top} = this.element.getBoundingClientRect();
+
+ let deltaAbs = Math.abs(e.deltaY) / 100;
+ if (0.01 < deltaAbs && deltaAbs < 1) {
+ deltaAbs = this.m * deltaAbs + this.b; // linearly increase intensity of small values that indicate a touchpad gesture is used
+ }
+ deltaAbs = deltaAbs * this.intensity;
+
+ const delta = e.deltaY < 0 ? deltaAbs : -deltaAbs;
+ const ox = (left - e.clientX) * delta;
+ const oy = (top - e.clientY) * delta;
+
+ this.onzoom(delta, ox, oy, 'wheel');
+ }
+
+
+ destroy() {
+ super.destroy();
+ this.wheelSubscription?.unsubscribe();
+ }
+
+ private initOverlay() {
+ const overlay = document.createElement('div');
+ overlay.id = 'zoom-overlay';
+ overlay.style.position = 'absolute';
+ overlay.style.top = '0';
+ overlay.style.left = '0';
+ overlay.style.width = '100%';
+ overlay.style.height = '100%';
+ overlay.style.backgroundColor = 'rgba(0, 0, 0, 0.6)';
+ overlay.style.color = 'white';
+ overlay.style.fontSize = '24px';
+ overlay.style.display = 'none'; // Hide by default
+ overlay.style.justifyContent = 'center';
+ overlay.style.alignItems = 'center';
+ overlay.style.pointerEvents = 'none'; // Allow interaction with editor
+
+ // Add the message text
+ const message = document.createElement('div');
+ message.innerText = 'Use ctrl / ⌘ + scroll to zoom';
+ message.style.pointerEvents = 'none';
+ overlay.appendChild(message);
+
+ // Append the overlay to the container
+ this.container.appendChild(overlay);
+ this.overlay = overlay;
+ }
+}
diff --git a/src/app/components/polyalg/polyalg-viewer/panning-boundary/index.ts b/src/app/components/polyalg/polyalg-viewer/panning-boundary/index.ts
index d60638a5..85cd9318 100644
--- a/src/app/components/polyalg/polyalg-viewer/panning-boundary/index.ts
+++ b/src/app/components/polyalg/polyalg-viewer/panning-boundary/index.ts
@@ -1,11 +1,10 @@
-import {NodeEditor} from 'rete';
+import {GetSchemes, NodeEditor} from 'rete';
import {AreaExtensions, AreaPlugin} from 'rete-area-plugin';
import {getFrameWeight} from './frame';
import {animate, watchPointerMove} from './utils';
-import {Schemes} from '../alg-editor';
interface Props {
- area: AreaPlugin;
+ area: AreaPlugin, any>;
selector: AreaExtensions.Selector;
intensity?: number;
padding?: number;
diff --git a/src/app/containers/default-layout/default-layout.component.html b/src/app/containers/default-layout/default-layout.component.html
index 68064b21..9b4f7cfb 100644
--- a/src/app/containers/default-layout/default-layout.component.html
+++ b/src/app/containers/default-layout/default-layout.component.html
@@ -75,6 +75,13 @@
+
+
+
+ Workflows
+
+
+
@@ -115,7 +122,7 @@
-
+
@@ -126,8 +133,8 @@
-
-
+
+
diff --git a/src/app/containers/default-layout/default-layout.component.ts b/src/app/containers/default-layout/default-layout.component.ts
index fb92c94f..26b0f46a 100644
--- a/src/app/containers/default-layout/default-layout.component.ts
+++ b/src/app/containers/default-layout/default-layout.component.ts
@@ -1,4 +1,4 @@
-import {AfterContentChecked, ChangeDetectorRef, Component, Inject, OnDestroy, signal} from '@angular/core';
+import {AfterContentChecked, ChangeDetectorRef, Component, Inject, OnDestroy, OnInit, signal, ViewChild} from '@angular/core';
import {DOCUMENT} from '@angular/common';
import {navItems} from '../../_nav';
import {LeftSidebarService} from '../../components/left-sidebar/left-sidebar.service';
@@ -7,13 +7,19 @@ import {CrudService} from '../../services/crud.service';
import {PluginService} from '../../services/plugin.service';
import {freeSet} from '@coreui/icons';
import {WebuiSettingsService} from '../../services/webui-settings.service';
+import {filter, Subscription} from 'rxjs';
+import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
+import {map} from 'rxjs/operators';
+import {SidebarComponent} from '@coreui/angular';
@Component({
selector: 'app-dashboard',
templateUrl: './default-layout.component.html',
styleUrls: ['./default-layout.component.scss']
})
-export class DefaultLayoutComponent implements OnDestroy, AfterContentChecked {
+export class DefaultLayoutComponent implements OnInit, OnDestroy, AfterContentChecked {
+ @ViewChild('leftSidebar') leftSidebarComponent: SidebarComponent;
+
public navItems = navItems;
public sidebarMinimized = true;
private changes: MutationObserver;
@@ -22,6 +28,9 @@ export class DefaultLayoutComponent implements OnDestroy, AfterContentChecked {
hover = signal(false);
modal = signal(false);
+ isFluid = signal(false);
+ private routeDataSubscription: Subscription;
+
constructor(
public _sidebar: LeftSidebarService,
@@ -30,6 +39,8 @@ export class DefaultLayoutComponent implements OnDestroy, AfterContentChecked {
public _crud: CrudService,
public _plugin: PluginService,
public _left: LeftSidebarService,
+ private _route: ActivatedRoute,
+ private _router: Router,
private changeDetector: ChangeDetectorRef,
@Inject(DOCUMENT) _document?: any,
) {
@@ -45,12 +56,24 @@ export class DefaultLayoutComponent implements OnDestroy, AfterContentChecked {
}
+ ngOnInit(): void {
+ this.isFluid.set(this.getLastChildData().isFullWidth || false);
+
+ this.routeDataSubscription = this._router.events.pipe(
+ filter(event => event instanceof NavigationEnd),
+ map(() => this.getLastChildData())
+ ).subscribe(data => {
+ this.isFluid.set(data.isFullWidth || false);
+ });
+ }
+
ngAfterContentChecked(): void {
this.changeDetector.detectChanges();
}
ngOnDestroy(): void {
this.changes.disconnect();
+ this.routeDataSubscription.unsubscribe();
}
getConnectedColor() {
@@ -90,4 +113,21 @@ export class DefaultLayoutComponent implements OnDestroy, AfterContentChecked {
handleModalChange($event: boolean) {
this.modal.set($event);
}
+
+ private getLastChildData() {
+ // data of child routes: https://stackoverflow.com/a/50780702
+ let route = this._route;
+ while (route.firstChild) {
+ route = route.firstChild;
+ }
+ return route.snapshot.data;
+ }
+
+ changedVisible(isVisible: boolean) {
+ // find a better solution to keep the sidebar component hidden after rescaling the window?
+ if (isVisible && !this._left.isVisible()) {
+ this._left.isVisible.set(isVisible);
+ setTimeout(() => this._left.isVisible.set(!isVisible), 10);
+ }
+ }
}
diff --git a/src/app/models/ui-request.model.ts b/src/app/models/ui-request.model.ts
index 1c0717c2..0645e328 100644
--- a/src/app/models/ui-request.model.ts
+++ b/src/app/models/ui-request.model.ts
@@ -75,9 +75,11 @@ export class QueryRequest extends UIRequest {
export class GraphRequest extends QueryRequest {
type = 'GraphRequest';
+ nodeIds: string[];
constructor(namespace: string, nodeIds: Set, edgeIds: Set) {
super('MATCH * RETURN *', false, false, 'CYPHER', namespace);
+ this.nodeIds = Array.from(nodeIds);
}
}
diff --git a/src/app/plugins/notebooks/components/edit-notebook/edit-notebook.component.html b/src/app/plugins/notebooks/components/edit-notebook/edit-notebook.component.html
index b0779414..e2aae92f 100644
--- a/src/app/plugins/notebooks/components/edit-notebook/edit-notebook.component.html
+++ b/src/app/plugins/notebooks/components/edit-notebook/edit-notebook.component.html
@@ -168,8 +168,8 @@
- |