Merge branch 'release-v0.1' into dependabot/pip/backend/cryptography-…

…41.0.4

backend/requirements.txt

@@ -7,7 +7,7 @@ cryptography==41.0.4
 defusedxml==0.7.1
 Deprecated==1.2.14
 dj-rest-auth==4.0.1
-Django==4.2.2
+Django==4.2.3
 django-allauth==0.54.0
 django-cors-headers==4.1.0
 django-coverage-plugin==3.0.0

frontend/.env.development

@@ -2,3 +2,4 @@ VUE_APP_DOMAIN="http://localhost:8000/"
 VUE_APP_DOMAIN_FRONTEND="http://localhost:8080/"
 VUE_APP_DOMAIN_WEBSOCKET="localhost"
 VUE_APP_DOMAIN_WEBSOCKET_PORT=9000
+VUE_APP_DOMAIN_FEATUREIDESERVICE="http://localhost:10000/"

frontend/.env.production

@@ -2,4 +2,5 @@ VUE_APP_DOMAIN="https://doener.tobiasbetz.de/"
 VUE_APP_DOMAIN_FRONTEND="https://ddueruem.tobiasbetz.de/"
 VUE_APP_DOMAIN_WEBSOCKET="boerek.tobiasbetz.de"
 VUE_APP_DOMAIN_WEBSOCKET_PORT=443
+VUE_APP_DOMAIN_FEATUREIDESERVICE="http://localhost:10000/"
 NODE_ENV="production"

frontend/package.json

@@ -43,7 +43,7 @@
         "@vue/cli-service": "~5.0.8",
         "eslint": "^8.43.0",
         "eslint-plugin-vue": "^9.15.0",
-        "node-sass": "^7.0.3",
+        "node-sass": "^9.0.0",
         "sass": "~1.32.0",
         "sass-loader": "^10.0.0",
         "vue-cli-plugin-vuetify": "~2.5.0",

frontend/src/classes/Commands/FeatureModel/NewEmptyModelCommand.js

@@ -23,7 +23,7 @@ export class NewEmptyModelCommand extends Command {
             calculations: undefined,
             comments: [],
             featureOrder: undefined,
-            rootNode: new FeatureNode(null, 'Root', 'and', false, false),
+            rootNode: new FeatureNode(null, 'Root', 'and', true, false),
         };
     }
 

frontend/src/classes/Commands/FeatureModel/RemoveCommand.js

@@ -0,0 +1,48 @@
+import {FeatureNodeCommand} from "@/classes/Commands/FeatureModel/FeatureNodeCommand";
+
+export class RemoveCommand extends FeatureNodeCommand {
+    constructor(node, dstIndex) {
+        super();
+        this.node = node;
+        this.parent = node.parent
+        this.dstIndex = dstIndex
+
+        // Properties for undo.
+        this.oldData = {
+            name: this.node.name,
+            groupType: this.node.groupType,
+            mandatory: this.node.isMandatory,
+            abstract: this.node.isAbstract,
+        };
+    }
+
+    undo() {
+        this.parent.uncollapse();
+        this.parent.unhideChildren();
+
+        this.parent.insertChildAtIndex(this.node, this.dstIndex);
+    }
+
+    execute() {
+        this.parent.uncollapse();
+        this.parent.unhideChildren();
+
+        this.parent.removeChild(this.node);
+    }
+
+    createDTO() {
+        return {
+            commandType: 'remove',
+            nodeName: this.node.name,
+            dstIndex: this.dstIndex,
+        };
+    }
+
+    markChanges() {
+        this.parent.markAsEdited()
+    }
+
+    unmarkChanges() {
+        this.parent.unmarkAsEdited()
+    }
+}

frontend/src/classes/Commands/FeatureModel/SliceCommand.js

@@ -0,0 +1,37 @@
+import {Command} from "@/classes/Commands/Command";
+import * as init from '@/services/FeatureModel/init.service.js';
+
+export class SliceCommand extends Command {
+    constructor(oldFM, newFM) {
+        super();
+        this.featureModelComponent = oldFM;
+        this.d3Data = this.featureModelComponent.$refs.featureModelTree.d3Data;
+
+        // Constraint command manager
+        this.constraintCommandManager = this.featureModelComponent.constraintCommandManager;
+        this.historyCommands = this.constraintCommandManager.historyCommands;
+        this.futureCommands = this.constraintCommandManager.futureCommands;
+
+        this.oldRoot = this.d3Data.root;
+
+        this.oldData = this.featureModelComponent.data;
+        this.newData = newFM;
+    }
+
+    execute() {
+        this.featureModelComponent.data = this.newData;
+        init.initData(this.d3Data, this.newData.rootNode);
+    }
+
+
+    undo() {
+        this.featureModelComponent.data = this.oldData;
+        this.d3Data.root = this.oldRoot;
+    }
+
+    createDTO() {
+        return {
+            commandType: 'slice-model',
+        };
+    }
+}

frontend/src/classes/Constraint/SoloDisjunction.js

@@ -0,0 +1,41 @@
+import {ConstraintItem} from "@/classes/Constraint/ConstraintItem";
+
+
+export class SoloDisjunction extends ConstraintItem {
+    constructor(item) {
+        super();
+        this.item = item;
+    }
+
+    count() {
+        return 1;
+    }
+
+    toString() {
+        return `${this.addPossibleBrackets(this.item)}`;
+    }
+
+    toStringForEdit() {
+        return `${this.addPossibleBracketsForEdit(this.item)}`;
+    }
+
+    toStringPostfix() {
+        return `${this.item.toStringPostfix()}`;
+    }
+
+    toStringXML() {
+        return `<disj>${this.item.toStringXML()}</disj>`;
+    }
+
+    getFeatureNodes() {
+        return this.item.getFeatureNodes();
+    }
+
+    setConstraint(constraint) {
+        this.item.setConstraint(constraint);
+    }
+
+    removeConstraint() {
+        this.item.removeConstraint();
+    }
+}

frontend/src/classes/FeatureNode.js

@@ -74,6 +74,10 @@ export class FeatureNode {
         return this.children.length === 0;
     }
 
+    setGroupType(groupType) {
+        this.groupType = groupType;
+    }
+
     uncollapse(toRoot = true) {
         if (this.isCollapsed && !this.isLeaf()) {
             this.d3Node.children = this.d3Node.collapsedChildren;

frontend/src/classes/constants.js

@@ -62,7 +62,7 @@ export const EXAMPLE_FEATURE_MODEL_XML = `
 <featureModel>
     <properties/>
         <struct>
-            <and name="Root">
+            <and name="Root" mandatory="true">
                 <feature mandatory="true" name="Feature A"/>
                 <feature mandatory="false" name="Feature B"/>
             </and>