Merge remote-tracking branch 'origin/develop' into develop

Author: julian

src/main/resources/static/js/pages/editor/Editor.js

@@ -1,11 +1,14 @@
 import accordions from "../../shared/modules/accordions.js";
-import { identifierValid, widgetsValid } from "./utils/editorValidations.js";
+import {
+  identifierValid,
+  widgetsValid,
+  sourcesValid,
+} from "./utils/editorValidations.js";
 import state from "./utils/editorState.js";
 import {
   createSource,
   createWidget,
   loadSources,
-  saveSources,
 } from "./utils/editorActions.js";
 import { debounce } from "../../shared/modules/utils.js";
 import {
@@ -30,7 +33,7 @@ export default class Editor {
     this.initGrid();
 
     // Load existing data
-    loadSources(config.sources || []);
+    loadSources(config.sources || [], config.generators || []);
     state.grid.load(config.widgets || []);
 
     // Replace whitespaces in the id with dashes
@@ -133,11 +136,13 @@ export default class Editor {
     const pipelines = await getPipelines();
     const config = {
       id: id,
-      sources: saveSources(),
+      sources: state.sources,
+      generators: state.generators,
       widgets: state.grid.save(false),
     };
 
-    const ok = identifierValid(config) && widgetsValid(config);
+    const ok =
+      identifierValid(config) && widgetsValid(config) && sourcesValid(config);
 
     if (ok && pipelines.includes(config.id)) {
       state.modal.confirm(

src/main/resources/static/js/pages/editor/configs/Source.js

@@ -3,7 +3,7 @@ import { getAnnotations } from "../../../api/annotations.api.js";
 export default class Source {
   static defaultConfig = {
     uri: "",
-    createsGenerators: [],
+    settings: {},
   };
   static formConfig = {
     uri: {

src/main/resources/static/js/pages/editor/controller/SourceController.js

@@ -14,7 +14,7 @@ export default class SourceController {
     this.item = item;
   }
 
-  init() {
+  init(generators = []) {
     const buttons = this.root.querySelectorAll("button");
     const options = this.root.querySelector(".dv-dropdown-menu");
     const body = this.root.querySelector(".dv-source-card-body");
@@ -26,10 +26,13 @@ export default class SourceController {
     );
 
     // Load existing generators
-    for (const config of this.item.createsGenerators) {
+    for (const config of [
+      ...(this.item.createsGenerators || []),
+      ...generators,
+    ]) {
       this.appendGenerator(body, config);
     }
-    this.item.createsGenerators = [];
+    delete this.item.createsGenerators;
 
     // Append available generator options
     Object.values(configs).forEach((Generator) => {

src/main/resources/static/js/pages/editor/utils/editorActions.js

@@ -4,30 +4,17 @@ import WidgetController from "../controller/WidgetController.js";
 import SourceController from "../controller/SourceController.js";
 import GeneratorController from "../controller/GeneratorController.js";
 
-export function loadSources(configs) {
+export function loadSources(sources, generators) {
   const container = document.querySelector(".dv-sources-container");
 
-  for (const config of configs) {
+  for (const config of sources) {
     const controller = createSource(config);
 
     container.prepend(controller.root);
-    controller.init();
+    controller.init(generators);
   }
 }
 
-export function saveSources() {
-  const sources = structuredClone(state.sources);
-
-  for (const generator of state.generators) {
-    const { source: id, ...rest } = generator;
-    const source = sources.find((item) => item.id === id);
-
-    source.createsGenerators.push(rest);
-  }
-
-  return sources;
-}
-
 export function createSource(config) {
   const source = deepClone(config);
   source.id = source.id || randomId("Source");

src/main/resources/static/js/pages/editor/utils/editorValidations.js

@@ -42,3 +42,21 @@ export function widgetsValid(config) {
     return false;
   }
 }
+
+export function sourcesValid(config) {
+  const empty = config.sources.filter((source) => source.uri === "");
+
+  if (empty.length === 1) {
+    state.modal.alert(
+      "Empty Sources",
+      `There is one source with no annotation type selected.`,
+    );
+  } else if (empty.length > 1) {
+    state.modal.alert(
+      "Empty Sources",
+      `There are ${empty.length} sources with no annotation type selected.`,
+    );
+  }
+
+  return empty.length === 0;
+}