Merge pull request #1881 from DSD-DBS/license-server-id

fix: Minor frontend fixes for T4C instance components
DSD-DBS · Oct 7, 2024 · 69159ef · 69159ef
2 parents 015e5d2 + 586382b
commit 69159ef
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 11 deletions.
diff --git a/backend/capellacollab/core/database/migration.py b/backend/capellacollab/core/database/migration.py
@@ -378,6 +378,7 @@ def create_t4c_instance_and_repositories(db):
         host="localhost",
         port=2036,
         cdo_port=12036,
+        http_port=8080,
         license_server=default_license_server,
         rest_api="http://localhost:8081/api/v1.0",
         username="admin",

diff --git a/...app/settings/modelsources/t4c-settings/edit-t4c-instance/edit-t4c-instance.component.html b/...app/settings/modelsources/t4c-settings/edit-t4c-instance/edit-t4c-instance.component.html
@@ -151,10 +151,10 @@ <h2 class="text-xl font-medium">
         </mat-form-field>
       </fieldset>
       <mat-form-field subscriptSizing="dynamic" appearance="fill">
-        <mat-label>Experimental REST API</mat-label>
+        <mat-label>REST API</mat-label>
         <input matInput formControlName="rest_api" />
         @if (form.controls.rest_api.errors?.required) {
-          <mat-error>The REST server URL is required.</mat-error>
+          <mat-error>The REST API server URL is required.</mat-error>
         } @else if (form.controls.rest_api.errors?.pattern) {
           <mat-error>The URL should start with "http(s)://"</mat-error>
         }
@@ -207,7 +207,12 @@ <h2 class="text-xl font-medium">
           (t4cInstanceWrapperService.t4cInstance$ | async) !== undefined
         ) {
           @if (!isArchived) {
-            <button mat-flat-button color="primary" (click)="enableEditing()">
+            <button
+              mat-flat-button
+              color="primary"
+              (click)="enableEditing()"
+              data-testid="edit-button"
+            >
               Edit
             </button>
           } @else {

diff --git a/...c/app/settings/modelsources/t4c-settings/edit-t4c-instance/edit-t4c-instance.component.ts b/...c/app/settings/modelsources/t4c-settings/edit-t4c-instance/edit-t4c-instance.component.ts
@@ -139,6 +139,8 @@ export class EditT4CInstanceComponent implements OnInit, OnDestroy {
         const t4cInstance = {
           ...initialT4CInstance,
           password: '***********',
+          version_id: initialT4CInstance.version.id,
+          license_server_id: initialT4CInstance.license_server.id,
         };
         this.isArchived = t4cInstance.is_archived;
         this.form.patchValue(t4cInstance);

diff --git a/...src/app/settings/modelsources/t4c-settings/edit-t4c-instance/edit-t4c-instance.stories.ts b/...src/app/settings/modelsources/t4c-settings/edit-t4c-instance/edit-t4c-instance.stories.ts
@@ -2,18 +2,40 @@
  * SPDX-FileCopyrightText: Copyright DB InfraGO AG and contributors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { ActivatedRoute } from '@angular/router';
 import { Meta, StoryObj, moduleMetadata } from '@storybook/angular';
+import { userEvent, within } from '@storybook/test';
 import { T4CInstanceWrapperService } from 'src/app/services/settings/t4c-instance.service';
+import { T4CLicenseServerWrapperService } from 'src/app/services/settings/t4c-license-server.service';
+import { MockActivedRoute } from 'src/storybook/routes';
 import {
   MockT4CInstanceWrapperService,
+  MockT4CLicenseServerWrapperService,
   mockT4CInstance,
+  mockT4CLicenseServer,
 } from 'src/storybook/t4c';
 import { mockToolVersion } from 'src/storybook/tool';
 import { EditT4CInstanceComponent } from './edit-t4c-instance.component';
 
 const meta: Meta<EditT4CInstanceComponent> = {
   title: 'Settings Components/Modelsources/T4C/Server Instance',
   component: EditT4CInstanceComponent,
+  args: {
+    capellaVersions: [mockToolVersion],
+  },
+  decorators: [
+    moduleMetadata({
+      providers: [
+        {
+          provide: T4CLicenseServerWrapperService,
+          useFactory: () =>
+            new MockT4CLicenseServerWrapperService(mockT4CLicenseServer, [
+              mockT4CLicenseServer,
+            ]),
+        },
+      ],
+    }),
+  ],
 };
 
 export default meta;
@@ -26,7 +48,6 @@ export const AddInstance: Story = {
 export const ExistingInstance: Story = {
   args: {
     existing: true,
-    capellaVersions: [mockToolVersion],
   },
   decorators: [
     moduleMetadata({
@@ -38,17 +59,20 @@ export const ExistingInstance: Story = {
               mockT4CInstance,
             ]),
         },
+        {
+          provide: ActivatedRoute,
+          useFactory: () =>
+            new MockActivedRoute({
+              instance: -1,
+            }),
+        },
       ],
     }),
   ],
 };
 
 export const EditExistingInstance: Story = {
-  args: {
-    existing: true,
-    editing: true,
-    capellaVersions: [mockToolVersion],
-  },
+  args: {},
   decorators: [
     moduleMetadata({
       providers: [
@@ -59,16 +83,26 @@ export const EditExistingInstance: Story = {
               mockT4CInstance,
             ]),
         },
+        {
+          provide: ActivatedRoute,
+          useFactory: () =>
+            new MockActivedRoute({
+              instance: -1,
+            }),
+        },
       ],
     }),
   ],
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    const editButton = canvas.getByTestId('edit-button');
+    await userEvent.click(editButton);
+  },
 };
 
 export const ArchivedInstance: Story = {
   args: {
-    existing: true,
     isArchived: true,
-    capellaVersions: [mockToolVersion],
   },
   decorators: [
     moduleMetadata({
@@ -80,6 +114,13 @@ export const ArchivedInstance: Story = {
               mockT4CInstance,
             ]),
         },
+        {
+          provide: ActivatedRoute,
+          useFactory: () =>
+            new MockActivedRoute({
+              instance: -1,
+            }),
+        },
       ],
     }),
   ],