added the connection and its data models model form

src/@noctua.form/models/annoton/annoton.ts

@@ -9,6 +9,9 @@ import { AnnotonError } from "./parser/annoton-error.js";
 import { AnnotonNode } from './annoton-node'
 
 export class Annoton extends SaeGraph {
+ gp;
+ annotonPresentation;
+ annotonRows;
  nodes;
  annotonType;
  annotonModelType;

src/@noctua.form/models/annoton/cam.ts

@@ -35,6 +35,14 @@ export class Cam {
  this._annotons = annoton;
  }
 
+ getAnnotonByConnectionId(connectionId) {
+ const self = this;
+ let result = _.find(self._annotons, (annoton: Annoton) => {
+ return annoton.connectionId === connectionId;
+ })
+
+ return result;
+ }
 
  getMFNodes() {
  const self = this;

src/@noctua.form/services/annoton-connector.service.ts

@@ -7,11 +7,13 @@ import { FormGroup, FormControl, FormBuilder, FormArray, Validators } from '@ang
 import { noctuaFormConfig } from './../noctua-form-config';
 import { NoctuaFormConfigService } from './config/noctua-form-config.service';
 import { NoctuaLookupService } from './lookup.service';
+import { CamService } from '@noctua.form/services/cam.service';
 
 import * as _ from 'lodash';
 declare const require: any;
 const each = require('lodash/forEach');
 
+import { Cam } from '@noctua.form/models/annoton/cam';
 import { Annoton } from '@noctua.form/models/annoton/annoton';
 import { AnnotonNode } from '@noctua.form/models/annoton/annoton-node';
 
@@ -24,26 +26,37 @@ import { CamFormMetadata } from './../models/forms/cam-form-metadata';
  providedIn: 'root'
 })
 export class NoctuaAnnotonConnectorService {
+ cam: Cam;
  public annoton: Annoton;
+ public subjectMFNode: AnnotonNode;
+ public objectMFNode: AnnotonNode;
  public annotonPresentation;
  private connectorForm: AnnotonConnectorForm;
  private connectorFormGroup: BehaviorSubject<FormGroup | undefined>;
  public connectorFormGroup$: Observable<FormGroup>;
 
  constructor(private _fb: FormBuilder, private noctuaFormConfigService: NoctuaFormConfigService,
+ private camService: CamService,
  private noctuaLookupService: NoctuaLookupService) {
 
  this.annoton = this.noctuaFormConfigService.createAnnotonConnectorModel();
  this.connectorFormGroup = new BehaviorSubject(null);
  this.connectorFormGroup$ = this.connectorFormGroup.asObservable()
 
+ this.camService.onCamChanged.subscribe((cam) => {
+ this.cam = cam;
+ });
+
  this.initalizeForm();
  }
 
  initalizeForm(annoton?: Annoton) {
  if (annoton) {
  this.annoton = annoton;
  }
+
+ this.subjectMFNode = this.annoton.getNode('mf');
+ this.objectMFNode = this.annoton.getNode('mf-1');
  this.connectorForm = this.createConnectorForm()
  this.connectorFormGroup.next(this._fb.group(this.connectorForm));
  }
@@ -58,6 +71,17 @@ export class NoctuaAnnotonConnectorService {
  return connectorForm;
  }
 
+ createConnection(subjectId, objectId, edge?) {
+ let subjectAnnoton: Annoton = this.cam.getAnnotonByConnectionId(subjectId);
+ let objectAnnoton: Annoton = this.cam.getAnnotonByConnectionId(objectId);
+
+ let subjectMFNode = subjectAnnoton.getMFNode();
+ let objectMFNode = objectAnnoton.getMFNode();
+ let annoton = this.noctuaFormConfigService.createAnnotonConnectorModel(subjectMFNode, objectMFNode, edge);
+
+ this.initalizeForm(annoton);
+ }
+
  connectorFormToAnnoton(annoton: Annoton, connectorForm) {
  const self = this;
 
@@ -66,7 +90,6 @@ export class NoctuaAnnotonConnectorService {
  console.dir(annoton)
  }
 
-
  clearForm() {
  this.annoton = this.noctuaFormConfigService.createAnnotonModel(
  this.annoton.annotonType,

src/@noctua.form/services/cam.service.ts

@@ -29,6 +29,7 @@ export class CamService {
  baseUrl = environment.spaqrlApiUrl;
  curieUtil: any;
  loading: boolean = false;
+ cam: Cam;
  onCamsChanged: BehaviorSubject<any>;
  onCamChanged: BehaviorSubject<any>;
 
@@ -58,7 +59,9 @@ export class CamService {
  });
  cam.expanded = true;
  this.noctuaGraphService.getGraphInfo(cam, modelId);
+ this.cam = cam;
  this.onCamChanged.next(cam);
+
  return cam;
  }
 

src/@noctua.form/services/config/noctua-form-config.service.ts

@@ -919,12 +919,12 @@ export class NoctuaFormConfigService {
 
  }
 
- createAnnotonConnectorModel() {
+ createAnnotonConnectorModel(srcSubjectMFNode?: AnnotonNode, srcObjectMFNode?: AnnotonNode, edge?: any) {
  const self = this;
  let annoton = new Annoton();
  let modelIds = _.cloneDeep(self._modelRelationship);
- let subjectMFNode = self.generateNode('mf');
- let objectMFNode = self.generateNode('mf', { id: '-1' });
+ let subjectMFNode: AnnotonNode;
+ let objectMFNode: AnnotonNode;
  let edgeOption = {
  selected: noctuaFormConfig.edge.upstreamOfOrWithin,
  options: [
@@ -937,11 +937,28 @@ export class NoctuaFormConfigService {
  ]
  };
 
+ if (srcSubjectMFNode) {
+ subjectMFNode = srcSubjectMFNode;
+ } else {
+ subjectMFNode = self.generateNode('mf');
+ }
+
+ if (srcObjectMFNode) {
+ objectMFNode = srcObjectMFNode;
+ } else {
+ objectMFNode = self.generateNode('mf', { id: '-1' });
+ }
+
  annoton.addNode(subjectMFNode);
  annoton.addNode(objectMFNode);
  subjectMFNode.addEdgeOption(edgeOption);
  // annoton.addEdge(subjectMFNode, objectMFNode, annoton.edgeOption.selected);
 
+ if (edge) {
+ edgeOption.selected = edge;
+ annoton.addEdge(subjectMFNode, objectMFNode, edgeOption.selected);
+ }
+
  return annoton;
  }
 

src/@noctua.form/services/graph.service.ts

@@ -152,7 +152,7 @@ export class NoctuaGraphService {
 
  self.graphPreParse(cam.graph).subscribe((data) => {
  cam.annotons = self.graphToAnnotons(cam.graph);
- cam.annotons = [...self.annotonsToTable(cam.graph, cam.annotons), ...self.ccComponentsToTable(cam.graph, data)]
+ self.annotonsToTable(cam.graph, cam.annotons)
  cam.onGraphChanged.next(cam.annotons);
  })
 
@@ -662,33 +662,25 @@ export class NoctuaGraphService {
  });
  }
 
- annotonsToTable(graph, annotons) {
+ annotonsToTable(graph, annotons: Annoton[]) {
  const self = this;
- let result = [];
+ // let result = [];
 
  each(annotons, function (annoton) {
- let annotonRows = self.annotonToTableRows(graph, annoton);
+ annoton.annotonRows = self.annotonToTableRows(graph, annoton);
 
- result = result.concat(annotonRows);
+ // result = result.concat(annotonRows);
  });
 
- return result;
+ // return result;
  }
 
- annotonToTableRows(graph, annoton) {
+ annotonToTableRows(graph, annoton: Annoton) {
  const self = this;
- let result = [];
 
  let gpNode = annoton.getGPNode();
-
- let row = {
- gp: gpNode.term.control.value.label,
- original: JSON.parse(JSON.stringify(annoton)),
- annoton: annoton,
- annotonPresentation: self.formGridService.getAnnotonPresentation(annoton),
- }
-
- return row;
+ //annoton.gpTerm = gpNode.term.control.value.label;
+ annoton.annotonPresentation = self.formGridService.getAnnotonPresentation(annoton);
  }
 
  ccComponentsToTable(graph, annotons) {