Merge pull request #53 from oneteme/develop

Develop
oneteme · Nov 22, 2024 · 1882c68 · 1882c68
2 parents faca40a + 6ffd455
commit 1882c68
Show file tree

Hide file tree

Showing 179 changed files with 9,580 additions and 3,655 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,19 @@
+name: CI/CD
+on:
+  push:
+    branches: [ "main" ]
+    paths-ignore: [ "README.md", "doc/**" ]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
diff --git a/angular.json b/angular.json
@@ -53,6 +53,21 @@
             "namedChunks": true
           },
           "configurations": {
+            "local": {
+              "optimization": false,
+              "sourceMap": true,
+              "aot": true,
+              "extractLicenses": false,
+              "namedChunks": false,
+              "vendorChunk": false,
+              "buildOptimizer": false,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {
@@ -82,14 +97,17 @@
               ]
             }
           },
-          "defaultConfiguration": ""
+          "defaultConfiguration": "local"
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
             "browserTarget": "ng-admin-free:build"
           },
           "configurations": {
+            "local": {
+              "browserTarget": "smart-ihm:build:local"
+            },
             "production": {
               "browserTarget": "ng-admin-free:build:production"
             }

diff --git a/environments/environment.prod.ts b/environments/environment.prod.ts
diff --git a/environments/environment.ts b/environments/environment.ts
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1,7 @@
+sonar.organization= jarvis
+sonar.projectKey= oneteme_inspect-app
+sonar.host.url= https://sonarcloud.io
+
+# relative paths to source directories. More details and properties are described
+# in https://sonarcloud.io/documentation/project-administration/narrowing-the-focus/
+sonar.sources=.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,27 +1,49 @@
 <nav>
-  <mat-toolbar color="primary" style="display: flex; align-items: center; height: 48px;">
-    <span style="margin-right: 1em;">Trace Api</span>
+    <mat-toolbar color="primary" style="display: flex; align-items: center; height: 48px;">
+        <span style="margin-right: 0.5em;cursor:pointer" [routerLink]="['home']">INSPECT</span>
 
-    <a style="color: inherit" [routerLink]="['session/api']" routerLinkActive="item-selected"
-      [queryParams]="{env: env.value}">
-      <button mat-button>Liste des API</button>
-    </a>
-    <a style="color: inherit" [routerLink]="['session/main']" routerLinkActive="item-selected"
-      [queryParams]="{env: env.value}">
-      <button mat-button>Liste des Sessions</button>
-    </a>
-
-    <span style="flex-grow: 1;"></span>
-    <mat-form-field appearance="fill" class="md-2 no-subscript" [class.loading]="isLoadingEnv">
-      <mat-select [formControl]="env">
-        <mat-option *ngFor="let e of envs" [value]="e">{{e}}</mat-option>
-      </mat-select>
-      <mat-spinner *ngIf="isLoadingEnv" [diameter]="18"></mat-spinner>
-    </mat-form-field>
-  </mat-toolbar>
+        <button mat-icon-button [matMenuTriggerFor]="menu">
+            <mat-icon>more_vert</mat-icon>
+        </button>
+        <button mat-icon-button [routerLink]="['architecture']">
+            <mat-icon class="material-symbols-outlined">lan</mat-icon>
+        </button>
+        <mat-menu #menu="matMenu">
+            <button mat-menu-item [routerLink]="['session/rest']" routerLinkActive="item-selected"
+                    [queryParams]="{env: env.value}">
+                <mat-icon>{{ MAPPING_TYPE['rest'].icon }}</mat-icon>
+                <span>{{ MAPPING_TYPE['rest'].title }}</span>
+            </button>
+            <button mat-menu-item [routerLink]="['session/main/batch']" routerLinkActive="item-selected"
+                    [queryParams]="{env: env.value}">
+                <mat-icon class="material-symbols-outlined">{{ MAPPING_TYPE['batch'].icon }}</mat-icon>
+                <span>{{ MAPPING_TYPE['batch'].title }}</span>
+            </button>
+            <button mat-menu-item [routerLink]="['session/main/startup']" routerLinkActive="item-selected"
+                    [queryParams]="{env: env.value}">
+                <mat-icon>{{ MAPPING_TYPE['startup'].icon }}</mat-icon>
+                <span>{{ MAPPING_TYPE['startup'].title }}</span>
+            </button>
+            <button mat-menu-item [routerLink]="['session/main/view']" routerLinkActive="item-selected"
+                    [queryParams]="{env: env.value}">
+                <mat-icon>{{ MAPPING_TYPE['view'].icon }}</mat-icon>
+                <span>{{ MAPPING_TYPE['view'].title }}</span>
+            </button>
+        </mat-menu>
+        <span style="flex-grow: 1;"></span>
+        <mat-form-field appearance="fill" class="md-2 no-subscript" [class.loading]="isLoadingEnv">
+            <mat-select [formControl]="env">
+                <mat-option *ngFor="let e of envs" [value]="e">{{ e }}</mat-option>
+            </mat-select>
+            <mat-spinner *ngIf="isLoadingEnv" [diameter]="18"></mat-spinner>
+        </mat-form-field>
+        <a href="https://github.com/orgs/oneteme/projects/17" style="margin-left: 0.5em" target="_blank" mat-icon-button>
+            <mat-icon svgIcon="github"></mat-icon>
+        </a>
+    </mat-toolbar>
 </nav>
 <mat-drawer-container>
-  <mat-drawer-content style="overflow-x: hidden; padding: 0.5em">
-    <router-outlet></router-outlet>
-  </mat-drawer-content>
+    <mat-drawer-content style="overflow-x: hidden; padding: 0.5em">
+        <router-outlet></router-outlet>
+    </mat-drawer-content>
 </mat-drawer-container>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
@@ -5,5 +5,5 @@
 }
 
 .item-selected {
-    background: rgba(0,0,0,.2);
+    background-color: var(--mat-menu-item-hover-state-layer-color);
 }