-
-Several screenshots can be found in the [`docs`](./docs/).
-
-# Features List
-
-- [x] manage devices to connect to
- - [ ] manage devices groupings for bulk configuration
-- [x] manage YANG schemas stored in GUI to represent received data
- - [ ] interaction with user by asking unknown module used by the connected device
-- [x] display configuration and data of the connected device (data tree view)
-- [x] edit configuration data of the device
-- [ ] bulk configuration (set configuration of multiple device at once)
-- [x] YANG explorer to display/browse YANG schema (currently just basic textual information)
-- [ ] receive NETCONF notifications and present them to user
-- [ ] accept NETCONF Call Home connections
-- [ ] plugin interface for schema-specific applications
-
-# Dependencies
-The application is created as a module to the [liberouter-gui](https://github.com/CESNET/liberouter-gui)
-framework, so to install it, follow the [liberouter-gui instructions](https://github.com/CESNET/liberouter-gui/wiki/Deploying-LiberouterGUI). When you decide to deploy production version, there is pre-built Netopeer2GUI as a [release package](https://github.com/CESNET/Netopeer2GUI/releases). To configure your web server, please follow the mentioned liberouter-gui instructions or have a look at [`*-release` vagrant image(s)](./vagrant/).
-
-The backend is a Flask server written in Python 3 and utilizing [libyang](https://github.com/CESNET/libyang)
-and [libnetconf2](https://github.com/CESNET/libnetconf2) Python bindings.
-Unfortunatelly, the code of the bindings is not yet finished, so please use
-the devel branches of the mentioned libraries:
-```
-$ git clone -b devel https://github.com/CESNET/libyang
-$ mkdir -p libyang/build && cd libyang/build
-$ cmake -DGEN_LANGUAGE_BINDINGS=ON ..
-$ make
-# make install
-```
-```
-$ git clone -b devel https://github.com/CESNET/libnetconf2
-$ mkdir -p libnetconf2/build && cd libnetconf2/build
-$ cmake -DENABLE_PYTHON=ON ..
-$ make
-# make install
-```
-
-Or alternatively install binary packages of [libyang](https://software.opensuse.org//download.html?project=home%3Aliberouter&package=libyang-experimental) and [libnetconf2](https://software.opensuse.org//download.html?project=home%3Aliberouter&package=libnetconf2-experimental).
-
-# Vagrant
-For fast and simple testing/development deployment, you can use the prepared
-Vagrantfiles for instantiating virtual machine. More information can be found
-[here](./vagrant/).
+# netconf-gui
+A GUI for the libnetconf2 library. Web-based NETCONF management tool.
+
+**This project is a demo of the capabilities of the libnetconf2 libraries!**
+As such, we will not provide full support for this project. You may still open issues, but a response is not guaranteed.
+
+## Docker
+You can use Docker to try the demo. Navigate to the docker folder and follow the instructions from the README file there.
+Only Docker is required to run the demo. Other dependencies are installed automatically.
+
+**We recommend using Docker over local installation** to prevent installation issues.
+
+
+## Installation on a local machine
+
+To install the NetconfGUI, follow these steps:
+
+1. Follow the instructions in the [libyang repository](https://github.com/CESNET/libyang) and install libyang.
+2. Follow the instructions in the [libnetconf2 repository](https://github.com/CESNET/libnetconf2) and install libnetconf2 with python bindings (Option `-DENABLE_PYTHON=on` when using cmake)
+3. Follow the quick start guide in the [liberouter GUI repository](https://github.com/CESNET/liberouter-gui). On step two, copy the NetconfGUI repository to liberouter GUI `modules` folder.
+4. Navigate to `modules/Netopeer2GUI/frontend` and run `npm run build:tools` to build plugins.
+5. Start the Liberouter GUI and navigate to `http://localhost:4200` in your browser
diff --git a/app.config.json b/app.config.json
index 63cb023..3c81706 100644
--- a/app.config.json
+++ b/app.config.json
@@ -1,16 +1,28 @@
{
- "logo" : "assets/netopeer/logo.png",
- "name" : "Netopeer",
+ "logo": "assets/img/logo.png",
+ "name": "Netopeer2 GUI",
+ "authorization" : true,
"colorTheme" : {
"colorMain" : "#354b68",
"colorHighlight" : "#3d5676",
"colorSelected" : "#3d5676",
- "colorSelected2" : "#6888b1"
+ "colorSelected2" : "#6888b1",
+ "colorBackground": "#fafafa",
+ "colorItemBackground": "#fff",
+ "colorText": "#231f20",
+ "colorTextInverse": "#fff",
+ "colorLink": "#0068a2",
+ "colorLinkHover": "#00a1e3",
+ "colorHeading": "#555"
},
"api" : {
"url" : "/libapi",
"host" : null,
"port" : null,
"proto" : null
+ },
+ "assets": {
+ "input": "netopeer2gui/assets",
+ "output": "libnetconf"
}
-}
+}
\ No newline at end of file
diff --git a/assets/tools-config.json b/assets/tools-config.json
new file mode 100644
index 0000000..e42be8c
--- /dev/null
+++ b/assets/tools-config.json
@@ -0,0 +1,26 @@
+{
+ "yang-configure": {
+ "name": "Yang Configure",
+ "path": "/assets/libnetconf/tools/yang-configure.js",
+ "image": "/assets/libnetconf/tools/img/configure.png",
+ "description": "Configure devices using the NETCONF protocol"
+ },
+ "yang-explorer": {
+ "name": "Yang Explorer",
+ "path": "/assets/libnetconf/tools/yang-explorer.js",
+ "image": "/assets/libnetconf/tools/img/explorer.png",
+ "description": "Browse uploaded yang schemas"
+ },
+ "example": {
+ "name": "Example tool",
+ "path": "/assets/libnetconf/tools/example.js",
+ "image": "/assets/libnetconf/tools/img/example.png",
+ "description": "Does nothing... yet."
+ },
+ "color-picker": {
+ "name": "Color picker",
+ "path": "/assets/libnetconf/tools/color-picker.js",
+ "image": "/assets/libnetconf/tools/img/example.png",
+ "description": "Pick a color for RGB enabled devices."
+ }
+}
diff --git a/assets/tools/3rdpartylicenses.txt b/assets/tools/3rdpartylicenses.txt
new file mode 100644
index 0000000..cc22582
--- /dev/null
+++ b/assets/tools/3rdpartylicenses.txt
@@ -0,0 +1,211 @@
+@angular/common@6.1.10
+MIT
+MIT
+
+@angular/router@6.1.10
+MIT
+MIT
+
+rxjs@6.2.2
+Apache-2.0
+Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright (c) 2015-2018 Google, Inc., Netflix, Inc., Microsoft Corp. and contributors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/assets/tools/img/configure.png b/assets/tools/img/configure.png
new file mode 100644
index 0000000..25db3d1
Binary files /dev/null and b/assets/tools/img/configure.png differ
diff --git a/assets/tools/img/example.png b/assets/tools/img/example.png
new file mode 100644
index 0000000..bcb5e37
Binary files /dev/null and b/assets/tools/img/example.png differ
diff --git a/assets/tools/img/explorer.png b/assets/tools/img/explorer.png
new file mode 100644
index 0000000..53b7f2d
Binary files /dev/null and b/assets/tools/img/explorer.png differ
diff --git a/backend/__init__.py b/backend/__init__.py
index 92ae9c0..6b0750f 100644
--- a/backend/__init__.py
+++ b/backend/__init__.py
@@ -1,37 +1,48 @@
-"""
-Netopeer2 GUI backend
-File: __init__.py
-Author: Radek Krejci
-
-
\ No newline at end of file
diff --git a/frontend/config/config.component.scss b/frontend/config/config.component.scss
deleted file mode 100644
index 5912e12..0000000
--- a/frontend/config/config.component.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-@import '../netopeer-common';
-@import '../inventory/inventory.component';
-@import './tree.component';
-
-#config-data {
- cursor: default;
- width: 100%;
-}
-
-.item_action_expand,
-.item_action_collapse {
- height: 1em;
-}
-
-.item_action_collapse:hover {
- color: $red;
-}
-
-.item_action_expand:hover {
- color: $green;
-}
-
-.modifications-status {
- margin-bottom: 2em;
- margin-right: 2em;
- padding: 0.5em 1em;
-
- >div {
- position: fixed;
- bottom: 2em;
- right: 2em;
- background-color: $colorChanged;
- border: 2px solid $colorChangedBorder;
- padding: 0 1em;
- div {
- padding: 0.5em 0;
- }
- }
-}
-
-.loading {
- text-align: center;
- margin: auto;
- width: 10em;
- div {
- margin: auto;
- width: 50px;
- }
-}
diff --git a/frontend/config/config.component.ts b/frontend/config/config.component.ts
deleted file mode 100644
index e8e13d0..0000000
--- a/frontend/config/config.component.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import {Component, OnInit} from '@angular/core';
-import { Router } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-
-import {TreeService} from './tree.service';
-import {ModificationsService} from './modifications.service';
-import {SessionsService} from './sessions.service';
-import {Session} from './session';
-
-@Component({
- selector: 'netopeer-config',
- templateUrl: './config.component.html',
- styleUrls: ['./config.component.scss'],
- providers: [ModificationsService]
-})
-
-export class ConfigComponent implements OnInit {
- title = 'Configuration';
- activeSession: Session;
- err_msg = "";
- commit_error = [];
-
- constructor(public sessionsService: SessionsService,
- public modsService: ModificationsService,
- public treeService: TreeService,
- private router: Router) {}
-
- addSession() {
- this.router.navigateByUrl('/netopeer/inventory/devices');
- }
-
- reloadData() {
- switch (this.activeSession.dataPresence) {
- case 'root':
- this.activeSession.data = null;
- this.sessionsService.rpcGet(this.activeSession, false);
- break;
- case 'all':
- this.activeSession.data = null;
- this.sessionsService.rpcGet(this.activeSession, true);
- break;
- case 'mixed':
- this.sessionsService.rpcGetSubtree(this.activeSession.key, false).subscribe(result => {
- let root = this.activeSession.data;
- if (result['success']) {
- for (let newRoot of result['data']) {
- let matchIndex = -1;
- for (let i in root['children']) {
- if (newRoot['path'] == root['children'][i]['path']) {
- matchIndex = Number(i);
- break;
- }
- }
- if (matchIndex == -1) {
- /* add new subtree */
- root['children'].push(newRoot);
- } else {
- let subtree = root['children'][matchIndex];
- let filterIndex = this.activeSession.treeFilters.indexOf(subtree['path']);
- if (filterIndex != -1) {
- /* reloading currently present but not visible subtrees is postponed to the point they are displayed */
- subtree['subtreeRoot'] = true;
- delete subtree['children'];
- this.activeSession.treeFilters.splice(filterIndex, 1);
- this.activeSession.dataPresence = 'root';
- for (let root of this.activeSession.data['children']) {
- if (!('subtreeRoot' in root)) {
- this.activeSession.dataPresence = 'mixed';
- break;
- }
- }
- } else if (!('subtreeRoot' in subtree)) {
- /* reload currently present and visible subtrees */
- subtree['loading'] = true;
- this.sessionsService.rpcGetSubtree(this.activeSession.key, true, subtree['path']).subscribe(result => {
- subtree['loading'] = false;
- if (result['success']) {
- for (let iter of result['data']['children']) {
- this.treeService.setDirty(this.activeSession, iter);
- }
- subtree['children'] = result['data']['children'];
- this.treeService.updateHiddenFlags(this.activeSession);
- this.sessionsService.storeSessions();
- }
- });
- }
- }
- }
- }
- this.sessionsService.storeSessions();
- });
- }
- }
-
- disconnect(key: string) {
- this.sessionsService.close(key).subscribe(result => {
- if (result['success']) {
- if (!this.sessionsService.activeSession) {
- this.router.navigateByUrl('/netopeer/inventory/devices');
- }
- this.activeSession = this.sessionsService.getSession();
- } else {
- this.err_msg = result['error-msg'];
- }
- });
- }
-
- setCpbltsVisibility(value: boolean) {
- this.activeSession.cpbltsVisibility = value;
- this.sessionsService.storeSessions();
- }
-
- invertStatus() {
- this.activeSession.statusVisibility = !this.activeSession.statusVisibility;
- this.sessionsService.storeSessions();
- }
-
- getCapabilities(key: string) {
- if (this.activeSession.cpblts) {
- this.activeSession.cpbltsVisibility = true;
- this.sessionsService.storeSessions();
- return;
- }
- this.sessionsService.getCpblts(key).subscribe(result => {
- if (result['success']) {
- this.activeSession.cpblts = result['capabilities'];
- this.activeSession.cpbltsVisibility = true;
- } else {
- this.activeSession.cpbltsVisibility = false;
- this.err_msg = result['error-msg'];
- }
- this.sessionsService.storeSessions();
- });
- }
-
- parseCapabilityName(cpblt: string): string {
- let name = cpblt;
- let pos = cpblt.search('module=');
- if (pos != -1) {
- /* schema */
- pos += 7;
- name = cpblt.slice(pos);
- let end = name.search('&');
- if (end != -1) {
- name = name.slice(0, end);
- }
- } else {
- /* capability */
- pos = 0;
- if (cpblt.match('urn:ietf:params:netconf:capability:*')) {
- pos = 34;
- } else if (cpblt.match('urn:ietf:params:netconf:*')) {
- pos = 23;
- }
- name = cpblt.slice(pos);
-
- let end = name.search('\\?');
- if (end != -1) {
- name = name.slice(0, end);
- }
- pos = name.lastIndexOf(':')
- name = name.slice(0, pos);
- }
- return name;
- }
-
- parseCapabilityRevision(cpblt: string): string {
- let version = "";
- let pos = cpblt.search('revision=');
- if (pos != -1) {
- pos += 9;
- version = cpblt.slice(pos);
- let end = version.search('&');
- if (end != -1) {
- version = version.slice(0, end);
- }
- return version;
- } else if (cpblt.match('urn:ietf:params:netconf:*')) {
- let end = cpblt.search('\\?');
- if (end != -1) {
- cpblt = cpblt.slice(0, end);
- }
- pos = cpblt.lastIndexOf(':')
- version = cpblt.slice(pos + 1);
- }
- return version;
- }
-
- cancelChanges() {
- //console.log(JSON.stringify(this.activeSession.modifications))
- this.modsService.cancelModification(this.activeSession);
- this.commit_error = [];
- this.sessionsService.storeSessions();
- //console.log(JSON.stringify(this.activeSession.modifications))
- }
-
- applyChanges() {
- //console.log(JSON.stringify(this.activeSession.modifications))
- this.modsService.applyModification(this.activeSession).subscribe(result => {
- if (result['success']) {
- this.reloadData();
- this.commit_error = [];
- }
- else {
- this.commit_error = result['error'];
- }
- });
- }
-
- ngOnInit(): void {
- this.sessionsService.checkSessions();
- this.activeSession = this.sessionsService.getSession();
- if (this.activeSession && !this.activeSession.data) {
- this.sessionsService.rpcGet(this.activeSession, false);
- this.activeSession.dataPresence = 'root';
- }
- }
-}
diff --git a/frontend/config/modifications.service.ts b/frontend/config/modifications.service.ts
deleted file mode 100644
index dcf82c0..0000000
--- a/frontend/config/modifications.service.ts
+++ /dev/null
@@ -1,911 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-import { tap } from 'rxjs/operators';
-import { of } from 'rxjs';
-
-import { Session, Node, NodeSchema } from './session';
-import { SessionsService } from './sessions.service';
-import { TreeService } from './tree.service';
-
-/**
- * Enumeration of the ModificationRecord types.
- */
-export const enum ModificationType {
- /** Creating a new node */
- Create = "create",
- /** Changing value of a current leaf node */
- Change = "change",
- /** Delete a current node */
- Delete = "delete",
- /** Replacing a current node */
- Replace = "replace",
- /** Reordering user-ordered lists or leaf-lists */
- Reorder = "reorder"
-}
-
-/**
- * Record of a particular modification on configuration data.
- */
-export class ModificationRecord {}
-
-/**
- * Service to handle modification records stored in the Session. The class does not
- * provide any storage, it just implements functions to manipulate with the records
- * stored in particular Session.
- */
-@Injectable()
-export class ModificationsService {
-
- /**
- * Initiate services handlers.
- * @param sessionsService Handler to get data from the current activeSession.
- * @param treeService Handler to control data tree.
- * @param router Handler to redirect to other pages.
- */
- constructor(private sessionsService: SessionsService,
- private treeService: TreeService,
- private router: Router) {}
-
- /**
- * Get the Modification record for the given path, if the record does not
- * exist, a new one is created and returned to fill. If there are no records
- * so far, the Modifications list is created as dictionary.
- * @param activeSession Session to work with.
- * @param path Identifier of the modified node.
- * @returns Modification record for the given path.
- */
- createModificationsRecord(activeSession: Session, path: string): ModificationRecord {
- if (!activeSession.modifications) {
- activeSession.modifications = {};
- }
-
- if (!(path in activeSession.modifications)) {
- activeSession.modifications[path] = new ModificationRecord();
- }
- return activeSession.modifications[path];
- }
-
- /**
- * Get the Modification record for the given path, if the record
- * exist in the provided activeSession.
- * @param activeSession Session to work with.
- * @param path Identifier of the modified node.
- * @returns Modification record for the specified path or null
- * if there is no record for the given path.
- */
- getModificationsRecord(activeSession: Session, path: string): ModificationRecord {
- if (!activeSession.modifications) {
- return null;
- }
-
- if (!(path in activeSession.modifications)) {
- return null;
- }
- return activeSession.modifications[path];
- }
-
- /**
- * Remove the Modification record from the given activeSession. If it
- * is the last record, the Modifications list is removed.
- * @param activeSession Session to work with.
- * @param path Identifier of the modified node.
- */
- removeModificationsRecord(activeSession: Session, path: string = null): void {
- if (!activeSession.modifications) {
- return;
- }
-
- if (path && (path in activeSession.modifications)) {
- delete activeSession.modifications[path];
- }
-
- if (!Object.keys(activeSession.modifications).length) {
- delete activeSession.modifications;
- }
- }
-
- /**
- * Change the key of a particular record in the Modifications list of the
- * given activeSession.
- * @param activeSession Session to work with.
- * @param oldPath The current Identifier of the modified node used as a key.
- * @param newPath New value of the key for the Modification record so far
- * identified by oldPath.
- */
- renameModificationsRecord(activeSession: Session, oldPath: string, newPath: string): void {
- let record = this.getModificationsRecord(activeSession, oldPath);
- if (record) {
- activeSession.modifications[newPath] = record;
- delete activeSession.modifications[oldPath];
- }
- }
-
- /**
- * Set edit flag of the node to the given set value.
- * @param activeSession Session to work with.
- * @param node Node to work with.
- * @param set True to set, False to unset.
- */
- setEdit(activeSession: Session, node: Node, set: boolean = true): void {
- let waiting = false;
- if (set && node['info']['datatypebase'] == 'empty') {
- node['value'] = '';
- return;
- }
- if (set && !('values' in node['info'])) {
- switch (node['info']['datatypebase']) {
- case 'bits':
- case 'enumeration':
- waiting = true;
- this.sessionsService.schemaValues(activeSession.key, node).subscribe(result => {
- if (result['success']) {
- node['info']['values'] = result['data'];
- }
- node['edit'] = set;
- });
- break;
- case 'boolean':
- node['info']['values'] = ['true', 'false'];
- break;
- }
- /* TODO instance identifiers, leafrefs */
- }
- if (!waiting) {
- node['edit'] = set;
- }
- }
-
- /**
- * Checker function to get know if the node was marked as deleted.
- * @param node Node to be checked.
- * @param value Flag for leaf-lists, true if the specific instance node is
- * supposed to be checked, false in case any of the instances counts.
- * @returns true if the node was marked as deleted, false otherwise.
- */
- isDeleted(node: Node, value: boolean = false): boolean {
- if ('deleted' in node) {
- return node['deleted'];
- } else if (!value && node['info']['type'] == 8) {
- for (let item of this.treeService.nodesToShow(this.sessionsService.getSession(), node)) {
- if (item['deleted']) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Checker function to get know if some instance of the list or leaf-list
- * was moved (reordered).
- * @param activeSession Session to work with.
- * @param node Node to be checked.
- * @returns true if there is a moved instance of the given list or leaf-list.
- */
- isMoved(activeSession: Session, node: Node): boolean {
- let path = this.treeService.pathCutPredicate(node['path']);
- let record = this.getModificationsRecord(activeSession, path);
- if (record && record['type'] == ModificationType.Reorder) {
- return true;
- }
- return false;
- }
-
- /**
- * Physically remove the specific node from the parent's child list
- * @param activeSession Session to work with
- * @param parent Parent to be modified.
- * @param childArray Name of the children array: 'children' or 'newChildren'
- * @param node Node to be removed.
- */
- private deleteChild(activeSession: Session, parent: Node, childArray: string, node: Node): void {
- for (let i in parent[childArray]) {
- if (parent[childArray][i]['path'] == node['path']) {
- parent[childArray].splice(i, 1);
- break;
- }
- }
- if (childArray != 'children' && !parent[childArray].length) {
- delete parent[childArray];
- }
- }
-
- /**
- * Delete the given node from the configuration data. If the node exists
- * only in frontend's data (created but not committed), it is physically
- * removed. Otherwise, it is marked as deleted (checkable via isDeleted())
- * and Modification record is created.
- * @param activeSession Session to work with.
- * @param node Node to delete.
- */
- delete(activeSession: Session, node: Node): void {
- if ('new' in node) {
- if (node['info']['ordered']) {
- let path = this.treeService.pathCutPredicate(node['path']);
- let record = this.getModificationsRecord(activeSession, path);
- let siblings = this.treeService.nodesToShow(activeSession, node);
- for (let item of siblings) {
- if (record && ('reorder' in record)) {
- let orig_order = record['reorder'][item['order']];
- if (orig_order > record['reorder'][node['order']]) {
- record['reorder'].splice(item['order'], 1, orig_order - 1);
- }
- }
- if (item['order'] > node['order']) {
- item['order'] = item['order'] - 1;
- }
- }
- if (record && ('reorder' in record)) {
- record['reorder'].splice(node['order'], 1);
- let same = true;
- for (let item of siblings) {
- if (item['order'] != record['reorder'][item['order']]) {
- same = false;
- break;
- }
- }
- if (same) {
- this.removeModificationsRecord(activeSession, this.treeService.pathCutPredicate(node['path']));
- }
- }
- }
- /* removing newly created subtree */
- let parent = this.treeService.nodeParent(activeSession, node);
- if ('new' in parent) {
- /* removing just a subtree of the created tree */
- this.deleteChild(activeSession, parent, 'children', node);
- } else {
- this.removeModificationsRecord(activeSession, node['path']);
- this.deleteChild(activeSession, parent, 'newChildren', node);
- }
- } else {
- let record = this.createModificationsRecord(activeSession, node['path']);
- node['deleted'] = true;
- if (!('type' in record)) {
- /* new record */
- record['type'] = ModificationType.Delete;
- record['original'] = node;
- node['dirty'] = true;
- } else if (record['type'] == ModificationType.Change) {
- record['type'] = ModificationType.Delete;
- node['value'] = record['original'];
- delete record['original'];
- delete record['value'];
- }
- }
- }
-
- /**
- * Change value of the given leaf Node. If the Node exists only in
- * frontend's data (created but not committed), the changed value will be
- * reflected in the create modification record. Otherwise, new record is
- * created.
- * @param activeSession Session to work with.
- * @param node Leaf node to be changed.
- * @param leafValue New value of the leaf node
- */
- change(activeSession: Session, node: Node, leafValue: string) {
- let record = null;
- if (!('new' in node)) {
- record = this.createModificationsRecord(activeSession, node['path']);
- if (!('type' in record)) {
- /* new record */
- if (node['value'] == leafValue) {
- /* no change to the original value */
- this.setEdit(activeSession, node, false);
- this.removeModificationsRecord(activeSession);
- return;
- }
- record['type'] = ModificationType.Change;
- record['original'] = node['value'];
- record['value'] = leafValue;
- node['dirty'] = true;
- } else if (record['type'] == ModificationType.Change && record['original'] == leafValue) {
- /* change back to the original value, remove the change record */
- this.removeModificationsRecord(activeSession, node['path']);
- node['dirty'] = false;
- } else {
- /* another change of existing change record */
- record['value'] = leafValue;
- node['dirty'] = true;
- }
- } else if (node['info']['type'] == 8) {
- record = this.getModificationsRecord(activeSession, node['path']);
- let newPath = node['path'].slice(0, node['path'].lastIndexOf('[')) + '[.=\'' + leafValue + '\']';
- this.renameModificationsRecord(activeSession, node['path'], newPath);
- node['path'] = newPath
- } else if (node['info']['key']) {
- let parent = this.treeService.nodeParent(activeSession, node);
- parent['keys'].splice(parent['info']['keys'].indexOf(node['info']['name']),1, leafValue);
-
- /* hack to render changed keys of list - go to some other page and then come back */
- this.router.navigateByUrl('/netopeer').then(() => {this.router.navigateByUrl('/netopeer/config');});
- }
-
- node['value'] = leafValue;
- this.setEdit(activeSession, node, false);
- }
-
- /**
- * Open creating dialogue by setting necessary flags on given parent node.
- * @param activeSession Session to work with.
- * @param schemas List of available schema nodes for the node's children.
- * @param node Parent node where a new children is supposed to be created.
- */
- createOpen(activeSession: Session, schemas: NodeSchema[], node: Node): void {
- //console.trace();
- node['schemaChildren'] = schemas;
- node['creatingChild'] = {};
-
- if (schemas.length) {
- let children = this.treeService.childrenToShow(node);
- if (children.length) {
- let last = children[children.length - 1];
- if (last['info']['type'] == 16) {
- let instances = this.treeService.getInstances(activeSession, last);
- last = instances[instances.length - 1];
- }
- delete last['last'];
- if (last['info']['type'] == 8) {
- for (let sibling of this.treeService.getInstances(activeSession, last)) {
- if ('last' in sibling) {
- continue;
- }
- delete sibling["lastLeafList"];
- }
- }
- }
- }
- }
-
- /**
- * Set the 'last' flag to the correct child node, does not remove the flag
- * on wrong children. Correctly goes thogh both, 'children' as well as
- * 'newChildren' lists.
- * @param activeSession Session to work with.
- * @param parent Parent node to be processed.
- */
- private maintainLast(activeSession: Session, parent: Node): void {
- if ('schemaChildren' in parent) {
- return;
- }
- let children = this.treeService.childrenToShow(parent);
- if (children.length) {
- let last = children[children.length - 1];
- if (last['info']['type'] == 16) {
- let instances = this.treeService.getInstances(activeSession, last);
- last = instances[instances.length - 1];
- }
- last['last'] = true;
- if (last['info']['type'] == 8) {
- for (let sibling of this.treeService.getInstances(activeSession, last)) {
- if ('last' in sibling) {
- continue;
- }
- sibling["lastLeafList"] = true;
- }
- }
- }
- }
-
- /**
- * Close creating dialogue by removing flags from the given parent node.
- * @param activeSession Session to work with.
- * @param node Parent node where the creating dialogue was opened
- * @param abort Flag if the dialogue is closed due to abort or as success close.
- */
- createClose(activeSession: Session, node: Node, abort:boolean = true): void {
- //console.trace();
- if (abort && node['schemaChildren'].length) {
- this.maintainLast(activeSession, node);
- }
- delete node['creatingChild'];
- delete node['schemaChildren'];
- }
-
- /**
- * Get free position number for the list instance. Taken as a successor of the
- * highest id of the sibling list instances.
- * @param parent Parent node where a new list instance will be inserted.
- * @param path Path of the list to identify instances of the specific list
- * @return free position for the new instance (starts by 1)
- */
- private list_nextpos(parent: Node, path: string): number {
- let search;
- if ('new' in parent) {
- search = parent['children'];
- } else {
- search = parent['newChildren'];
- }
- let pos = 1;
- if (search.length) {
- for (let sibling of search) {
- if (sibling['path'].substr(0, path.length + 1) == path + '[') {
- let n = parseInt(sibling['path'].substring(path.length + 1));
- if (n >= pos) {
- pos = n + 1;
- }
- }
- }
- }
- return pos;
- }
-
- /**
- * Generate correct name for the schema node (so prefixed if needed)
- * @param parent Schema node of the parent.
- * @param child Schema node of the node to be processed.
- */
- schemaName(parent: NodeSchema, node: NodeSchema): string {
- if (parent['module'] != node['module']) {
- return node['module'] + ':' + node['name'];
- } else {
- return node['name'];
- }
- }
-
- /**
- * Create new node in given parent. If the parent Node exists only in
- * frontend's data (created but not committed), the child is inserted into
- * the 'children' list and no new Modification record is created - the node
- * will be created as part of creating the parent's subtree. Otherwise, the
- * child is inserted in 'newChildren' list and new record is created. In
- * case of creating list, all its keys are also created.
- * @param activeSession Session to work with.
- * @param parent Parent node where a new child is supposed to be created.
- * @param index Index in the 'schemaChildren' list specifying which node is supposed to be created.
- */
- create(activeSession: Session, parent: Node, index: number): void {
- //console.trace();
- let newNode = {};
- newNode['new'] = true;
- newNode['info'] = parent['schemaChildren'][index];
- if (parent['path'] == '/') {
- newNode['path'] = '/' + this.schemaName(parent['info'], newNode['info']);
- } else {
- newNode['path'] = parent['path'] + '/' + this.schemaName(parent['info'], newNode['info']);
- }
- newNode['dirty'] = true;
-
- if ('new' in parent) {
- if (!('children' in parent)) {
- parent['children'] = [];
- }
- parent['children'].push(newNode);
- } else {
- if (!('newChildren' in parent)) {
- parent['newChildren'] = [];
- }
- parent['newChildren'].push(newNode);
- }
-
- switch(newNode['info']['type']) {
- case 1: /* container */
- parent['schemaChildren'].splice(index, 1);
-
- newNode['children'] = [];
- /* open creation dialog for nodes inside the created container */
- this.sessionsService.childrenSchemas(activeSession.key, newNode).subscribe(result => {
- this.createOpen(activeSession, result, newNode);
- });
- break;
- case 4: /* leaf */
- parent['schemaChildren'].splice(index, 1);
-
- if ('default' in newNode['info']) {
- newNode['value'] = newNode['info']['default'];
- }
- this.setEdit(activeSession, newNode, true);
- break;
- case 8: /* leaf-list */
- /* check number of instances, if first, mark this as the first leaf-list instance */
- newNode['first'] = true; /* make nodesToShow working */
- let siblings = this.treeService.nodesToShow(activeSession, newNode);
- if (siblings.length != 1) {
- delete newNode['first'];
- }
- if (newNode['info']['ordered']) {
- newNode['order'] = siblings.length - 1;
- }
- if (newNode['info']['ordered']) {
- let record = this.getModificationsRecord(activeSession, newNode['path']);
- if (record && ('reorder' in record)) {
- record['reorder'].push(record['reorder'].length);
- }
- }
-
- newNode['path'] = newNode['path'] + '[' + this.list_nextpos(parent, newNode['path']) + ']';
- this.setEdit(activeSession, newNode, true)
- break;
- case 16: /* list */
- if (newNode['info']['ordered']) {
- let siblings = this.treeService.nodesToShow(activeSession, newNode);
- newNode['order'] = siblings.length - 1;
- }
- if (newNode['info']['ordered']) {
- let record = this.getModificationsRecord(activeSession, newNode['path']);
- if (record && ('reorder' in record)) {
- record['reorder'].push(record['reorder'].length);
- }
- }
- newNode['path'] = newNode['path'] + '[' + this.list_nextpos(parent, newNode['path']) + ']';
- newNode['keys'] = [];
- for (let key of newNode['info']['keys']) {
- newNode['keys'].push("");
- }
- newNode['children'] = [];
- /* open creation dialog for nodes inside the created list */
- this.sessionsService.childrenSchemas(activeSession.key, newNode).subscribe(result => {
- if (result && result.length) {
- this.createOpen(activeSession, result, newNode);
- }
-
- for (let key of newNode['info']['keys']) {
- for (let i in newNode['schemaChildren']) {
- if (newNode['schemaChildren'][i]['name'] == key && newNode['schemaChildren'][i]['module'] == newNode['info']['module']) {
- let newKey = {};
- newKey['new'] = true;
- newKey['info'] = newNode['schemaChildren'][i];
- newKey['path'] = newNode['path'] + '/' + this.schemaName(newNode['info'], newKey['info']);
- newKey['dirty'] = true;
- this.setEdit(activeSession, newKey, true)
- newNode['children'].push(newKey)
- newNode['schemaChildren'].splice(i, 1);
- if (!newNode['schemaChildren'].length) {
- newKey['last'] = true;
- this.createClose(activeSession, newNode, false);
- }
- }
- }
- }
- });
-
- break;
- }
-
- if (!parent['schemaChildren'].length) {
- newNode['last'] = true;
- this.createClose(activeSession, parent, false);
- }
-
- if (!('new' in parent)) {
- /* store the record about the newly created data */
- let record = this.createModificationsRecord(activeSession, newNode['path']);
- if (('type' in record) && record['type'] == ModificationType.Delete) {
- record['type'] = ModificationType.Replace;
- delete record['original']['deleted'];
- for (let i in parent['children']) {
- if (parent['children'][i] == record['original']) {
- parent['children'].splice(i, 1);
- break;
- }
- }
- } else {
- record['type'] = ModificationType.Create;
- }
- record['data'] = newNode;
- }
- //console.log(node)
- }
-
- /**
- * Cancel modification record connected with the given node.
- * @param activeSession Session to work with.
- * @param node Node element whose modification record will be removed.
- * @param recursion Flag to recursively process the node's subtree
- * @param reorder Boolean flag to remove also the reorder modification
- * connected with all the instances of the given node's schema node.
- * @param firstcall Flag for top level call to control recursion, do not
- * use outside the function itself
- */
- cancelModification(activeSession: Session, node: Node = activeSession.data,
- recursion: boolean = true, reorder: boolean = true, firstcall: boolean = true): void {
- if ('creatingChild' in node) {
- delete node['creatingChild'];
- }
- if ('deleted' in node) {
- delete node['dirty'];
- delete node['deleted'];
- }
-
- let parent = this.treeService.nodeParent(activeSession, node);
- if ('new' in node) {
- if (node['info']['type'] == 1 || node['info']['type'] == 4) {
- /* fix the list of nodes to create in parent */
- let schemas;
- if (!('schemaChildren' in parent)) {
- schemas = [];
- } else {
- schemas = parent['schemaChildren'];
- }
- schemas.push(node['info']);
- this.createOpen(activeSession, schemas, parent)
- }
-
- /* removing newly created subtree */
- this.delete(activeSession, node);
- } else if (activeSession.modifications) {
- let record = this.getModificationsRecord(activeSession, node['path']);
- if (record) {
- delete node['dirty'];
- if (record['type'] == ModificationType.Change) {
- node['value'] = record['original'];
- }
- this.removeModificationsRecord(activeSession, node['path']);
- if (!activeSession.modifications) {
- return;
- }
- }
- if (reorder) {
- let path = this.treeService.pathCutPredicate(node['path']);
- let record = this.getModificationsRecord(activeSession, path);
- if (record) {
- for (let item of this.treeService.getInstances(activeSession, node)) {
- item['order'] = record['reorder'][item['order']];
- delete item['last'];
- }
- this.removeModificationsRecord(activeSession, path);
- }
- }
- }
-
- /* recursion */
- if (recursion && 'children' in node) {
- if ('newChildren' in node) {
- for (let child of node['newChildren']) {
- let record = this.getModificationsRecord(activeSession, child['path']);
- if (record['type'] == ModificationType.Change) {
- node['children'].push(record['original'])
- }
- this.removeModificationsRecord(activeSession, child['path']);
- if (child['info']['ordered']) {
- let path = this.treeService.pathCutPredicate(child['path']);
- this.removeModificationsRecord(activeSession, path);
- }
- }
- delete node['newChildren'];
- }
- for (let child of node['children']) {
- delete child['last'];
- delete child['moved'];
- this.cancelModification(activeSession, child, true, reorder, false);
- if (child['info']['ordered']) {
- /* revert order change */
- let path = this.treeService.pathCutPredicate(child['path']);
- let record = this.getModificationsRecord(activeSession, path);
- if (record) {
- let nodes = this.treeService.nodesToShow(activeSession, child);
- for (let i in nodes) {
- nodes[i]['order'] = record['reorder'][i];
- }
- this.removeModificationsRecord(activeSession, path);
- }
- }
- }
- this.maintainLast(activeSession, node);
- }
- if (firstcall) {
- this.maintainLast(activeSession, parent);
- }
- }
-
- /**
- * Check presence of the necessary keys in lists and update its predicate if safe.
- * @param node Root node where to start checking
- * @param top internal recursion flag, do not use
- * @return null in case of success, error message in case of error.
- */
- private resolveKeys(node: Node, top: boolean = true): string {
- if (node['info']['type'] == 16) {
- if (!('children' in node) || !node['children'].length) {
- return 'no key in ' + node['path'];
- }
- let count = node['info']['keys'].length;
- if (node['children'].length != count || !node['children'][count - 1]['info']['key']) {
- return 'invalid number (expected ' + count + ') of keys in ' + node['path'];
- }
- }
-
- /* recursion */
- if (node['info']['type'] == 16 || node['info']['type'] == 1) {
- for (let i in node['children']) {;
- if (node['children'][i]['info']['type'] == 4) {
- /* leaf */
- if (!('value' in node['children'][i])) {
- if (node['children'][i]['info']['key']) {
- return 'not confirmed value of the ' + node['children'][i]['path'] + ' key.';
- }
- console.log('not confirmed node ' + node['children'][i]['path'] + ', removing it');
- node['children'].splice(i, 1);
- }
- } else if (node['children'][i]['info']['type'] == 8) {
- /* leaf-list */
- if (!('value' in node['children'][i])) {
- console.log('not confirmed node ' + node['children'][i]['path'] + ', removing it');
- node['children'].splice(i, 1);
- }
- } else {
- /* recursion */
- let msg = this.resolveKeys(node['children'][i], false);
- if (msg) {
- return msg;
- }
- }
- }
- }
-
- /* update predicate in path */
- if (node['info']['type'] == 16 && top) {
- node['path'] = node['path'].slice(0, node['path'].lastIndexOf('['))
- for (let i in node['info']['keys']) {
- node['path'] = node['path'] + '[' + node['info']['keys'][i] + '=\'' + node['children'][i]['value'] + '\']'
- }
- } else if (node['info']['type'] == 8 && top) {
- node['path'] = node['path'].slice(0, node['path'].lastIndexOf('[') + 1) + '.=\'' + node['value'][0] + '\']'
- }
- return null;
- }
-
- /**
- * Find the position of the highest absolute distance of the moved nodes.
- * @param nodes Array of user-ordered lists or leaf-lists with counted
- * distance information
- * @return Index in the given array of a node with the highest absolute
- * distance value
- */
- private getHighestDistIndex(nodes: Node[]): number {
- let val = 0;
- let pos = -1;
- for (let i in nodes) {
- let x = Math.abs(nodes[i]['dist'])
- if (x > val) {
- val = x;
- pos = Number(i);
- }
- }
- return pos;
- }
-
- /**
- * Create complete list predicate with all its keys
- * @param list Node to process
- * @return Predicate string.
- */
- private listPredicates(list: Node): string {
- let result = "";
- for (let key of list['children']) {
- if (!('key' in key['info'])) {
- break;
- }
- result.concat('[' + this.treeService.moduleName(key) + ':' + key['info']['name'] + '=\'' + key['value'] + '\']');
- }
- return result;
- }
-
- /**
- * Apply all the modification records of the given session by sending them to the backend.
- * @param activeSession Session whose Modification records will be applied
- * @return Received backend's result message
- */
- applyModification(activeSession: Session) {
- for (let mod in activeSession.modifications) {
- //console.log(JSON.stringify(mod));
- if (!('data' in activeSession.modifications[mod])) {
- continue;
- }
- /* remove not confirmed leaf/leaf-lists */
- if (activeSession.modifications[mod]['data']['info']['type'] == 4 || activeSession.modifications[mod]['data']['info']['type'] == 8) {
- if (!('value' in activeSession.modifications[mod]['data'])) {
- console.log('not confirmed node ' + activeSession.modifications[mod]['data']['path'] + ', removing it');
- this.cancelModification(activeSession, mod['data'], false, false);
- }
- }
- /* remove deleted nodes from the reorder data */
- if (activeSession.modifications[mod]['data']['info']['ordered'] && activeSession.modifications[mod]['type'] == ModificationType.Delete) {
- let record = this.getModificationsRecord(activeSession, this.treeService.pathCutPredicate(activeSession.modifications[mod]['data']['path']));
- if (record) {
- record['reorder'].splice(activeSession.modifications[mod]['data']['order'], 1);
- }
- }
- let err = this.resolveKeys(activeSession.modifications[mod]['data']);
- if (err) {
- console.log(err);
- return of({'success': false, 'error': [{'message': err}]});
- }
- }
-
- /* transform reorder records to move transactions */
- for (let mod in activeSession.modifications) {
- if (activeSession.modifications[mod]['type'] != ModificationType.Reorder) {
- continue;
- }
- let record = activeSession.modifications[mod];
- let node = this.treeService.pathNode(activeSession, mod);
- let nodes = this.treeService.nodesToShow(activeSession, node);
- /* prepare distances of the moved nodes */
- for (let i in nodes) {
- /* nodes are ordered, but contains also deleted nodes */
- if ('deleted' in nodes[i]) {
- nodes.splice(Number(i), 1);
- continue;
- }
- let pos_new = nodes[i]['order'];
- let pos_orig = record['reorder'][pos_new];
- nodes[i]['dist'] = pos_new - pos_orig;
- }
- /* eat distances to generate transactions */
- record['transactions'] = [];
- let pos = this.getHighestDistIndex(nodes);
- while (pos != -1) {
- if (nodes[pos]['dist'] < 0) {
- /* moved to the left */
- let offset = 1;
- for (; nodes[pos]['dist'] != 0; nodes[pos]['dist']++, offset++) {
- nodes[pos + offset]['dist']--;
- }
- offset--;
- let transaction = {};
- transaction['node'] = nodes[pos]['path'];
- if (pos == 0) {
- //console.log("moving " + nodes[pos]['path'] + " first")
- transaction['insert'] = 'first';
- } else {
- //console.log("moving " + nodes[pos]['path'] + " before " + nodes[pos + 1]['path'])
- transaction['insert'] = 'before';
- if (nodes[pos + 1]['info']['type'] == 8) {
- transaction['value'] = nodes[pos + 1]['value'];
- } else { /* 16 - list */
- transaction['key'] = this.listPredicates(nodes[pos + 1]);
- }
- }
- record['transactions'].splice(0, 0, transaction);
- let move = nodes[pos];
- nodes.splice(pos, 1);
- nodes.splice(pos + offset, 0, move);
- } else {
- /* moved to the right */
- let offset = 1
- for (; nodes[pos]['dist'] != 0; nodes[pos]['dist']--, offset++) {
- nodes[pos - offset]['dist']++;
- }
- offset--;
- let transaction = {};
- transaction['node'] = nodes[pos]['path'];
- if (pos == nodes.length - 1) {
- //console.log("moving " + nodes[pos]['path'] + " last")
- transaction['insert'] = 'last';
- } else {
- //console.log("moving " + nodes[pos]['path'] + " after " + nodes[pos - 1]['path'])
- transaction['insert'] = 'after';
- if (nodes[pos - 1]['info']['type'] == 8) {
- transaction['value'] = nodes[pos - 1]['value'];
- } else { /* 16 - list */
- transaction['key'] = this.listPredicates(nodes[pos - 1]);
- }
- }
- record['transactions'].splice(0, 0, transaction)
- let move = nodes[pos];
- nodes.splice(pos, 1);
- nodes.splice(pos - offset, 0, move);
- }
- pos = this.getHighestDistIndex(nodes);
- }
- for (let item of nodes) {
- delete item['dist'];
- }
- }
-
- //console.log(JSON.stringify(activeSession.modifications));
- return this.sessionsService.commit(activeSession).pipe(
- tap(result => {
- if (result['success']) {
- delete activeSession.modifications;
- } else {
- console.log(result);
- }
- return result;
- })
- )
- }
-}
diff --git a/frontend/config/ordering.directive.ts b/frontend/config/ordering.directive.ts
deleted file mode 100644
index a87dcbe..0000000
--- a/frontend/config/ordering.directive.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import { Directive, ElementRef, HostListener, Input, AfterContentChecked } from '@angular/core';
-
-import { ModificationsService, ModificationRecord, ModificationType } from './modifications.service';
-import { SessionsService } from './sessions.service';
-import { TreeService } from './tree.service';
-
-@Directive( {
- selector: '[orderingLists]'
-} )
-export class OrderingDirective implements AfterContentChecked {
- private _draggingElement: HTMLElement;
- private _droppedElement: HTMLElement;
- private _dropSucceded: boolean;
- private _isInsideContainer: boolean;
- @Input() node;
- @Input() activeSession;
-
- constructor(private element: ElementRef,
- private modsService: ModificationsService,
- private sessionsService: SessionsService,
- private treeService: TreeService) { }
-
- ngAfterContentChecked() {
- this.markDraggable();
- //console.log(this.element)
- }
-
- @HostListener( 'dragstart', ['$event'] )
- dragStart( event ) {
- //console.log("dragStart");
- this.savePositions( 'dragIndex' );
- this._draggingElement = this.getDraggableElement( event );
- event.dataTransfer.setDragImage(this._draggingElement.firstElementChild, event.offsetX, event.offsetY);
- this._dropSucceded = false;
- this._isInsideContainer = true;
-
- /* Firefox hack */
- event.dataTransfer.setData('text', 'bad firefox');
- }
-
- @HostListener( 'dragend', ['$event'] )
- dragEnd( event: MouseEvent ) {
- //console.log("dragEnd");
- if ( !this._dropSucceded ) {
- this.cancelDragging();
- }
- event.preventDefault();
- }
-
- @HostListener( 'dragover', ['$event'] )
- dragOver( event: MouseEvent ) {
- //console.log("dragOver");
- // Required to receive "drop"" event
- event.preventDefault();
- }
-
- @HostListener( 'drag', ['$event'] )
- drag( event ) {
- //console.log("drag");
- // Check if mouse is outside container or not
- const divCoords = this.element.nativeElement.getBoundingClientRect();
- const inside = ( event.clientX >= divCoords.left && event.clientX <= divCoords.right && event.clientY >= divCoords.top && event.clientY <= divCoords.bottom );
- // Check if mouse mouves outisde container
- if ( this._isInsideContainer && !inside ) {
- this.cancelDragging();
- }
-
- this._isInsideContainer = inside;
- }
-
- @HostListener( 'dragenter', ['$event'] )
- dragEnter( event: MouseEvent ) {
- //console.log("dragEnter");
- const element: HTMLElement = this.getDraggableElement( event );
- if ( element && element.attributes ) {
- const draggingIndex = this._draggingElement.dataset['index'];
- const dropIndex = element.dataset['index'];
-
- if ( draggingIndex !== dropIndex ) {
- // Move dragging ghost element at its new position
- if ( draggingIndex > dropIndex ) {
- this.element.nativeElement.insertBefore( this._draggingElement, element );
- } else {
- this.element.nativeElement.insertBefore( this._draggingElement, element.nextSibling );
- }
- this.markDraggable();
- }
- }
-
- event.preventDefault();
- }
-
- @HostListener( 'drop', ['$event'] )
- drop( event: MouseEvent ) {
- //console.log("drop");
- this._dropSucceded = true;
- //console.log("moving " + this._draggingElement.dataset.dragIndex + " instead of " + this._draggingElement.dataset.index);
- let lastIndex = -1;
- let hasLast = false;
- let maintainLast = (this.node['info']['type'] == 16);
- let nodes = this.treeService.nodesToShow(this.activeSession, this.node);
- for ( let i = 0; i < this.element.nativeElement.childElementCount; i++ ) {
- let element = this.element.nativeElement.children[i];
- if (i == element.dataset.dragIndex) {
- /* no change */
- continue;
- }
- nodes[element.dataset.dragIndex]['order'] = i;
- if (maintainLast) {
- /* maintain last flag in lists, it is not important to maintain it in leaflist,
- * since it is enough to have it just present in one of them */
- if ('last' in nodes[element.dataset.dragIndex]) {
- hasLast = true;
- delete nodes[element.dataset.dragIndex]['last'];
- } else if (i == this.element.nativeElement.childElementCount - 1) {
- lastIndex = element.dataset.dragIndex;
- }
- }
- }
- if (hasLast) {
- nodes[lastIndex]['last'] = true;
- }
-
- let parent = this.treeService.nodeParent(this.activeSession, this.node);
- if (!('new' in parent)) {
- let path = this.treeService.pathCutPredicate(this.node['path'])
- let record = this.modsService.createModificationsRecord(this.activeSession, path);
- if (!('type' in record)) {
- /* new record */
- record['type'] = ModificationType.Reorder;
- record['reorder'] = [];
- for (let i in nodes) {
- record['reorder'].push(Number(i));
- }
- }
- let move = record['reorder'][this._draggingElement.dataset.dragIndex];
- record['reorder'].splice(this._draggingElement.dataset.dragIndex, 1);
- record['reorder'].splice(this._draggingElement.dataset.index, 0, move);
-
- //console.log(record['reorder']);
-
- let same = true;
- for (let item of nodes) {
- if (item['order'] != record['reorder'][item['order']]) {
- same = false;
- break;
- }
- }
- if (same) {
- this.modsService.removeModificationsRecord(this.activeSession, path);
- }
- }
- this.sessionsService.storeSessions();
- event.preventDefault();
- }
-
- private markDraggable() {
- for ( let i = 0; i < this.element.nativeElement.childElementCount; i++ ) {
- let element = this.element.nativeElement.children[i];
- element.draggable = true;
- element.dataset.index = i;
- }
- }
-
- private savePositions( attribute ) {
- for ( let i = 0; i < this.element.nativeElement.childElementCount; i++ ) {
- let element = this.element.nativeElement.children[i];
- element.dataset[attribute] = i;
- }
- }
-
- private getElementAt( attribute, index ) {
- for ( let i = 0; i < this.element.nativeElement.childElementCount; i++ ) {
- let element = this.element.nativeElement.children[i];
- if ( parseInt( element.dataset[attribute], 10 ) === index ) {
- return element;
- }
- }
- return null;
- }
-
- private cancelDragging() {
- let index = this.element.nativeElement.childElementCount - 1;
- // Get last element
- let beforeElement = this.getElementAt( 'dragIndex', index );
-
- while ( index > 0 ) {
- const element = this.getElementAt( 'dragIndex', index - 1 );
- this.element.nativeElement.insertBefore( element, beforeElement );
-
- beforeElement = element;
- index--;
- }
- }
-
- private getDraggableElement( event ): HTMLElement {
- let element: HTMLElement =
-
-
-
-
-
-
-
-
-
-
-
-
{{err_msg}}
- 
- 
- |
- Capability / Module | -Version | -
|---|---|---|
| - | {{parseCapabilityName(cap)}} | -{{parseCapabilityRevision(cap)}} | -
| - | Data | -
|---|
- Retrieving data ...
-
-
-
-
-
-
-
- Configuration data were changed. Do you wish to
- /
-
- all changes?
-
- x{{err['message']}}
-