Merge release candidate 1 into master

Author: VirtualSatai

angular.json

@@ -23,7 +23,11 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "aot": true,
-            "assets": ["src/favicon.ico", "src/assets"],
+            "assets": [
+              "src/favicon.ico", 
+              "src/assets",
+              { "glob": "**/*", "input": "node_modules/ngx-monaco-editor/assets/monaco", "output": "./assets/monaco/" }
+            ],
             "styles": [
               "./node_modules/animate.css/animate.min.css",
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "os2-io-t-frontend",
-  "version": "0.0.1",
+  "name": "os2iot-frontend",
+  "version": "1.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --watch",
@@ -22,6 +22,7 @@
     "@angular/platform-browser": "~9.1.11",
     "@angular/platform-browser-dynamic": "~9.1.11",
     "@angular/router": "~9.1.11",
+    "@auth0/angular-jwt": "^5.0.1",
     "@fortawesome/angular-fontawesome": "^0.6.1",
     "@fortawesome/fontawesome-free": "^5.13.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.28",
@@ -32,14 +33,15 @@
     "@ngx-translate/http-loader": "^6.0.0",
     "all": "0.0.0",
     "animate.css": "^4.1.1",
-    "bootstrap": "^5.0.0-alpha2",
+    "bootstrap": "5.0.0-alpha2",
     "file-saver": "^2.0.2",
     "guid-typescript": "^1.0.9",
     "jwt-decode": "^2.2.0",
     "leaflet": "^1.7.1",
     "moment": "^2.27.0",
     "ng": "0.0.0",
     "ng-inline-svg": "^11.0.0",
+    "ngx-monaco-editor": "^9.0.0",
     "ngx-papaparse": "^5.0.0",
     "popper.js": "^1.16.0",
     "rxjs": "~6.5.4",

package.json

@@ -7,7 +7,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { FormModule } from '@shared/components/forms/form.module';
-import { TopBarModule } from '@shared/components/top-bar/top-bar.module';
 import { NGMaterialModule } from '@shared/Modules/materiale.module';
 import { PipesModule } from '@shared/pipes/pipes.module';
 import { SharedModule } from '@shared/shared.module';
@@ -54,7 +53,6 @@ import { MatFormFieldModule } from '@angular/material/form-field';
     CommonModule,
     TranslateModule,
     FormsModule,
-    TopBarModule,
     ReactiveFormsModule,
     FormModule,
     RouterModule,
@@ -81,4 +79,4 @@ import { MatFormFieldModule } from '@angular/material/form-field';
     OrganisationListComponent,
   ],
 })
-export class AdminModule {}
+export class AdminModule { }

src/app/admin/admin.module.ts

@@ -1,46 +1,37 @@
-<app-top-bar *ngIf="organisation" [data]="organisation" [backButton]="backButton" [subPage]="true"></app-top-bar>
-
-<div class=" jumbotron m-md-4 p-md-3" *ngIf="organisation">
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="float-left">
-                <h2> {{organisation.name}}</h2>
+<div [hidden]="!organisation" *ngIf="organisation">
+    <app-top-bar [data]="organisation" [backButton]="backButton" [subPage]="true" [addDetailDowndown]="true"
+        [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="clickDelete()">
+    </app-top-bar>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-12 ">
+                <div class="jumbotron">
+                    <h3> {{'ORGANISATION.HEADLINE' | translate}}</h3>
+                    <app-general-details [data]="organisation"></app-general-details>
+                </div>
             </div>
-            <div class="btn-group float-right">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
-                    aria-haspopup="true" aria-expanded="false">
-                    {{'ORGANISATION.DROPDOWN' | translate}} <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu" attr.aria-labelledby="tableRowDropdown-{{organisation.id}}">
-                    <li class="dropdown-item">
-                        <a [routerLink]="['edit-organisation']"
-                            routerLinkActive="active">{{ 'ORGANISATION-TABLE-ROW.EDIT' | translate }}
-                        </a>
-                    </li>
-                    <li class="dropdown-item">
-                        <a (click)="clickDelete()"
-                            [routerLink]="">{{ 'PERMISSION.TABLE-ROW.DELETE' | translate }}
-                        </a>
-                    </li>
-                </ul>
+        </div>
+        <div class="row">
+            <div class="col-12">
+                <div class="jumbotron">
+                    <h3>
+                        {{ 'ORGANISATION.DETAIL.APPLICATIONS' | translate }}
+                    </h3>
+                    <app-applications-table [organizationId]="id">
+                    </app-applications-table>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-12">
+                <div class="jumbotron">
+                    <h3>
+                        {{ 'ORGANISATION.DETAIL.PERMISSIONS' | translate }}
+                    </h3>
+                    <app-permission-tabel [organisationId]="id">
+                    </app-permission-tabel>
+                </div>
             </div>
         </div>
     </div>
-</div>
-
-<div class="jumbotron m-md-4 p-md-3">
-    <h4 class="">
-        {{ 'ORGANISATION.DETAIL.APPLICATIONS' | translate }}
-    </h4>
-    <app-applications-table [applications]="applications" (deleteApplication)="deleteApplication($event)"
-        [isLoadingResults]="isLoadingResults">
-    </app-applications-table>
-</div>
-
-<div class="jumbotron m-md-4 p-md-3">
-    <h4 class="">
-        {{ 'ORGANISATION.DETAIL.PERMISSIONS' | translate }}
-    </h4>
-    <app-permission-tabel [permissions]="permissions" (deletePermission)="deletePermission($event)">
-    </app-permission-tabel>
 </div>