Use combined help items (#200)

* fix: bump deps * fix: use correct endpoint for combined loading of help items * fix: tests * fix: show help tests * fix: delete vscode stuff and correct gitignore --------- Co-authored-by: Christian Badura <[email protected]>
onecx · Sep 24, 2024 · 5861ff0 · 5861ff0
1 parent f89fbf8
commit 5861ff0
Show file tree

Hide file tree

Showing 9 changed files with 298 additions and 433 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,11 +22,7 @@ speed-measure-plugin*.json
 *.sublime-workspace
 
 # IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
+.vscode
 .history/*
 
 # misc

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "ngx-color": "^9.0.0",
     "primeflex": "^3.3.1",
     "primeicons": "^7.0.0",
-    "primeng": "^17.18.8",
+    "primeng": "^17.18.10",
     "rxjs": "7.8.1",
     "tslib": "^2.6.3",
     "zone.js": "~0.14.8"
@@ -86,14 +86,14 @@
     "@angular/cli": "~18.2.2",
     "@angular/compiler-cli": "^18.2.2",
     "@angular/language-service": "^18.2.2",
-    "@commitlint/cli": "^19.3.0",
-    "@commitlint/config-conventional": "^19.2.2",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
     "@openapitools/openapi-generator-cli": "^2.13.4",
     "@schematics/angular": "18.2.1",
     "@svgr/webpack": "^8.1.0",
     "@swc-node/register": "^1.10.9",
     "@types/jasmine": "~5.1.4",
-    "@types/node": "~22.5.1",
+    "@types/node": "~22.5.5",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "css-loader": "^7.1.2",

diff --git a/src/app/help/help-form/help-form.component.html b/src/app/help/help-form/help-form.component.html
@@ -73,7 +73,7 @@
         tooltipPosition="top"
         tooltipEvent="hover"
       />
-      <label class="" for="help_detail_form_base_url">{{ 'HELP_ITEM.BASE_URL' | translate }}</label>
+      <label class="ocx-required-label" for="help_detail_form_base_url">{{ 'HELP_ITEM.BASE_URL' | translate }}</label>
     </span>
     <span class="p-float-label">
       <input

diff --git a/src/app/help/help-form/help-form.component.spec.ts b/src/app/help/help-form/help-form.component.spec.ts
@@ -62,6 +62,7 @@ describe('HelpFormComponent', () => {
     const mockHelpItem = {
       itemId: 'id',
       productName: 'name',
+      baseUrl: 'base',
       operator: false
     }
     component.helpItem = mockHelpItem

diff --git a/src/app/help/help-form/help-form.component.ts b/src/app/help/help-form/help-form.component.ts
@@ -37,7 +37,7 @@ export class HelpFormComponent implements OnChanges {
       product: new FormControl(null, [Validators.required]),
       itemId: new FormControl(null, [Validators.required, Validators.minLength(2), Validators.maxLength(255)]),
       context: new FormControl(null, [Validators.maxLength(255)]),
-      baseUrl: new FormControl(null, [Validators.maxLength(255)]),
+      baseUrl: new FormControl(null, [Validators.required, Validators.maxLength(255)]),
       resourceUrl: new FormControl(null, [Validators.maxLength(255)]),
       operator: new FormControl(false)
     })