Merge branch 'stage'

OS2iot · Aug 28, 2024 · aeec53f · aeec53f
2 parents a70d18b + 6471125
commit aeec53f
Show file tree

Hide file tree

Showing 548 changed files with 15,525 additions and 15,337 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,11 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "printWidth": 120,
+  "semi": true,
+  "singleQuote": false,
+  "useTabs": false,
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "endOfLine": "auto"
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
@@ -1,78 +1,78 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { OrganisationDetailComponent } from './organisation/organisation-detail/organisation-detail.component';
-import { OrganisationEditComponent } from './organisation/organisation-edit/organisation-edit.component';
-import { OrganisationListComponent } from './organisation/organisation-list/organisation-list.component';
-import { OrganisationComponent } from './organisation/organisation.component';
-import { PermissionDetailComponent } from './permission/permission-detail/permission-detail.component';
-import { PermissionEditComponent } from './permission/permission-edit/permission-edit.component';
-import { PermissionListComponent } from './permission/permission-list/permission-list.component';
-import { PermissionComponent } from './permission/permission.component';
-import { UserDetailComponent } from './users/user-detail/user-detail.component';
-import { UserEditComponent } from './users/user-edit/user-edit.component';
-import { UserListComponent } from './users/user-list/user-list.component';
-import { UsersComponent } from './users/users.component';
-import { ApiKeyComponent } from './api-key/api-key.component';
-import { ApiKeyListComponent } from './api-key/api-key-list/api-key-list.component';
-import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.component';
-import { AcceptUserComponent } from './users/accept-user/accept-user.component';
-import { UserTableTabComponent } from '@app/admin/users/user-list/user-table-tab/user-table-tab.component';
-import { AwaitingUsersTableTabComponent } from '@app/admin/users/user-list/awaiting-user-tab/awaiting-users-table-tab.component';
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { OrganisationDetailComponent } from "./organisation/organisation-detail/organisation-detail.component";
+import { OrganisationEditComponent } from "./organisation/organisation-edit/organisation-edit.component";
+import { OrganisationListComponent } from "./organisation/organisation-list/organisation-list.component";
+import { OrganisationComponent } from "./organisation/organisation.component";
+import { PermissionDetailComponent } from "./permission/permission-detail/permission-detail.component";
+import { PermissionEditComponent } from "./permission/permission-edit/permission-edit.component";
+import { PermissionListComponent } from "./permission/permission-list/permission-list.component";
+import { PermissionComponent } from "./permission/permission.component";
+import { UserDetailComponent } from "./users/user-detail/user-detail.component";
+import { UserEditComponent } from "./users/user-edit/user-edit.component";
+import { UserListComponent } from "./users/user-list/user-list.component";
+import { UsersComponent } from "./users/users.component";
+import { ApiKeyComponent } from "./api-key/api-key.component";
+import { ApiKeyListComponent } from "./api-key/api-key-list/api-key-list.component";
+import { ApiKeyEditComponent } from "./api-key/api-key-edit/api-key-edit.component";
+import { AcceptUserComponent } from "./users/accept-user/accept-user.component";
+import { UserTableTabComponent } from "@app/admin/users/user-list/user-table-tab/user-table-tab.component";
+import { AwaitingUsersTableTabComponent } from "@app/admin/users/user-list/awaiting-user-tab/awaiting-users-table-tab.component";
 
 const adminRoutes: Routes = [
   {
-    path: 'organisations',
+    path: "organisations",
     component: OrganisationComponent,
     children: [
-      { path: '', component: OrganisationListComponent },
-      { path: 'new-organisation', component: OrganisationEditComponent },
-      { path: ':org-id', component: OrganisationDetailComponent },
+      { path: "", component: OrganisationListComponent },
+      { path: "new-organisation", component: OrganisationEditComponent },
+      { path: ":org-id", component: OrganisationDetailComponent },
       {
-        path: ':org-id/edit-organisation',
+        path: ":org-id/edit-organisation",
         component: OrganisationEditComponent,
       },
     ],
   },
   {
-    path: 'users',
+    path: "users",
     component: UsersComponent,
     children: [
       {
-        path: '',
+        path: "",
         component: UserListComponent,
         children: [
-          { path: 'existing', component: UserTableTabComponent },
-          { path: 'awaiting', component: AwaitingUsersTableTabComponent },
+          { path: "existing", component: UserTableTabComponent },
+          { path: "awaiting", component: AwaitingUsersTableTabComponent },
         ],
       },
-      { path: 'organization/:organization-id', component: UserListComponent },
-      { path: 'new-user', component: UserEditComponent },
-      { path: ':user-id', component: UserDetailComponent },
-      { path: ':user-id/edit-user', component: UserEditComponent },
-      { path: 'accept-user/:user-id/:org-id', component: AcceptUserComponent },
+      { path: "organization/:organization-id", component: UserListComponent },
+      { path: "new-user", component: UserEditComponent },
+      { path: ":user-id", component: UserDetailComponent },
+      { path: ":user-id/edit-user", component: UserEditComponent },
+      { path: "accept-user/:user-id/:org-id", component: AcceptUserComponent },
     ],
   },
   {
-    path: 'permissions',
+    path: "permissions",
     component: PermissionComponent,
     children: [
-      { path: '', component: PermissionListComponent },
-      { path: 'new-permission', component: PermissionEditComponent },
-      { path: ':permission-id', component: PermissionDetailComponent },
+      { path: "", component: PermissionListComponent },
+      { path: "new-permission", component: PermissionEditComponent },
+      { path: ":permission-id", component: PermissionDetailComponent },
       {
-        path: ':permission-id/edit-permission',
+        path: ":permission-id/edit-permission",
         component: PermissionEditComponent,
       },
     ],
   },
   {
-    path: 'api-key',
+    path: "api-key",
     component: ApiKeyComponent,
     children: [
-      { path: '', component: ApiKeyListComponent },
-      { path: 'new-api-key', component: ApiKeyEditComponent },
+      { path: "", component: ApiKeyListComponent },
+      { path: "new-api-key", component: ApiKeyEditComponent },
       {
-        path: ':api-key-id/edit-api-key',
+        path: ":api-key-id/edit-api-key",
         component: ApiKeyEditComponent,
       },
     ],

diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html
@@ -1 +1 @@
-<router-outlet></router-outlet>
+<router-outlet></router-outlet>
diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts
@@ -1,15 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
 
 @Component({
-  selector: 'app-admin',
-  templateUrl: './admin.component.html',
-  styleUrls: ['./admin.component.scss']
+  selector: "app-admin",
+  templateUrl: "./admin.component.html",
+  styleUrls: ["./admin.component.scss"],
 })
 export class AdminComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
+  ngOnInit(): void {}
 }
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
@@ -1,41 +1,41 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
 
-import { AdminRoutingModule } from './admin-routing.module';
-import { ApplicationsModule } from '@applications/applications.module';
-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 { NGMaterialModule } from '@shared/Modules/materiale.module';
-import { PipesModule } from '@shared/pipes/pipes.module';
-import { SharedModule } from '@shared/shared.module';
-import { PermissionDetailComponent } from './permission/permission-detail/permission-detail.component';
-import { PermissionEditComponent } from './permission/permission-edit/permission-edit.component';
-import { PermissionListComponent } from './permission/permission-list/permission-list.component';
-import { PermissionTabelComponent } from './permission/permission-list/permission-tabel/permission-tabel.component';
-import { PermissionComponent } from './permission/permission.component';
-import { OrganisationDetailComponent } from './organisation/organisation-detail/organisation-detail.component';
-import { OrganisationEditComponent } from './organisation/organisation-edit/organisation-edit.component';
-import { OrganisationListComponent } from './organisation/organisation-list/organisation-list.component';
-import { OrganisationTabelComponent } from './organisation/organisation-list/organisation-tabel/organisation-tabel.component';
-import { OrganisationComponent } from './organisation/organisation.component';
-import { UserDetailComponent } from './users/user-detail/user-detail.component';
-import { UserEditComponent } from './users/user-edit/user-edit.component';
-import { UserListComponent } from './users/user-list/user-list.component';
-import { UserTableComponent } from './users/user-list/user-table/user-table.component';
-import { UsersComponent } from './users/users.component';
-import { MatSelectModule } from '@angular/material/select';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatSelectSearchModule } from '@shared/components/mat-select-search/mat-select-search.module';
-import { ApiKeyComponent } from './api-key/api-key.component';
-import { ApiKeyListComponent } from './api-key/api-key-list/api-key-list.component';
-import { ApiKeyTableComponent } from './api-key/api-key-list/api-key-table/api-key-table.component';
-import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.component';
-import { AwaitingUsersTableComponent } from './users/user-list/awaiting-users-table/awaiting-users-table.component';
-import { AcceptUserComponent } from './users/accept-user/accept-user.component';
-import { UserTableTabComponent } from './users/user-list/user-table-tab/user-table-tab.component';
-import { AwaitingUsersTableTabComponent } from './users/user-list/awaiting-user-tab/awaiting-users-table-tab.component';
+import { AdminRoutingModule } from "./admin-routing.module";
+import { ApplicationsModule } from "@applications/applications.module";
+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 { NGMaterialModule } from "@shared/Modules/materiale.module";
+import { PipesModule } from "@shared/pipes/pipes.module";
+import { SharedModule } from "@shared/shared.module";
+import { PermissionDetailComponent } from "./permission/permission-detail/permission-detail.component";
+import { PermissionEditComponent } from "./permission/permission-edit/permission-edit.component";
+import { PermissionListComponent } from "./permission/permission-list/permission-list.component";
+import { PermissionTabelComponent } from "./permission/permission-list/permission-tabel/permission-tabel.component";
+import { PermissionComponent } from "./permission/permission.component";
+import { OrganisationDetailComponent } from "./organisation/organisation-detail/organisation-detail.component";
+import { OrganisationEditComponent } from "./organisation/organisation-edit/organisation-edit.component";
+import { OrganisationListComponent } from "./organisation/organisation-list/organisation-list.component";
+import { OrganisationTabelComponent } from "./organisation/organisation-list/organisation-tabel/organisation-tabel.component";
+import { OrganisationComponent } from "./organisation/organisation.component";
+import { UserDetailComponent } from "./users/user-detail/user-detail.component";
+import { UserEditComponent } from "./users/user-edit/user-edit.component";
+import { UserListComponent } from "./users/user-list/user-list.component";
+import { UserTableComponent } from "./users/user-list/user-table/user-table.component";
+import { UsersComponent } from "./users/users.component";
+import { MatSelectModule } from "@angular/material/select";
+import { MatFormFieldModule } from "@angular/material/form-field";
+import { MatSelectSearchModule } from "@shared/components/mat-select-search/mat-select-search.module";
+import { ApiKeyComponent } from "./api-key/api-key.component";
+import { ApiKeyListComponent } from "./api-key/api-key-list/api-key-list.component";
+import { ApiKeyTableComponent } from "./api-key/api-key-list/api-key-table/api-key-table.component";
+import { ApiKeyEditComponent } from "./api-key/api-key-edit/api-key-edit.component";
+import { AwaitingUsersTableComponent } from "./users/user-list/awaiting-users-table/awaiting-users-table.component";
+import { AcceptUserComponent } from "./users/accept-user/accept-user.component";
+import { UserTableTabComponent } from "./users/user-list/user-table-tab/user-table-tab.component";
+import { AwaitingUsersTableTabComponent } from "./users/user-list/awaiting-user-tab/awaiting-users-table-tab.component";
 
 @NgModule({
   declarations: [

diff --git a/src/app/admin/api-key/api-key-edit/api-key-edit.component.html b/src/app/admin/api-key/api-key-edit/api-key-edit.component.html
@@ -11,9 +11,7 @@
 
   <div class="row mb-5">
     <div class="form-group mt-3 col-12">
-      <label class="form-label" for="name">{{
-        'API-KEY.EDIT.NAME' | translate
-      }}</label
+      <label class="form-label" for="name">{{ "API-KEY.EDIT.NAME" | translate }}</label
       >*
       <input
         type="text"
@@ -34,9 +32,7 @@
 
   <div class="row mb-5">
     <div class="form-group mt-3 col-12">
-      <label class="form-label" for="permissions">{{
-        'QUESTION.PERMISSION.SELECT-PERMISSION' | translate
-      }}</label
+      <label class="form-label" for="permissions">{{ "QUESTION.PERMISSION.SELECT-PERMISSION" | translate }}</label
       >*
       <mat-select
         class="form-control"
@@ -45,10 +41,7 @@
         [(ngModel)]="apiKeyRequest.permissionIds"
         [multiple]="true"
       >
-        <mat-option
-          *ngFor="let permission of permissions"
-          [value]="permission.id"
-        >
+        <mat-option *ngFor="let permission of permissions" [value]="permission.id">
           {{ permission.name }}
         </mat-option>
       </mat-select>
@@ -57,10 +50,10 @@
 
   <div class="form-group mt-5">
     <button (click)="routeBack()" class="btn btn-secondary" type="button">
-      {{ 'GEN.CANCEL' | translate }}
+      {{ "GEN.CANCEL" | translate }}
     </button>
     <button class="btn btn-primary ml-2" type="submit">
-      {{ 'GEN.SAVE' | translate }}
+      {{ "GEN.SAVE" | translate }}
     </button>
   </div>
 </form>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<router-outlet></router-outlet>
		<router-outlet></router-outlet>