From 04321a0d73a648d326c99eba69bf9532e2f1d2e8 Mon Sep 17 00:00:00 2001 From: August Andersen Date: Mon, 3 Nov 2025 10:35:59 +0100 Subject: [PATCH 1/3] frontend changed based on access control --- Dockerfile-prod | 4 ++-- .../admin/organisation/organisation.service.ts | 5 ----- .../users/accept-user/accept-user.component.ts | 2 +- .../users/user-detail/user-detail.component.ts | 2 +- src/app/admin/users/user-minimal.service.ts | 5 ----- src/app/admin/users/user.service.ts | 4 ++-- .../payload-device-datatarget.service.ts | 17 ----------------- src/app/shared/services/me.service.ts | 1 - src/app/shared/services/sigfox.service.ts | 2 -- 9 files changed, 6 insertions(+), 36 deletions(-) diff --git a/Dockerfile-prod b/Dockerfile-prod index 5d67b0a9..258939b8 100644 --- a/Dockerfile-prod +++ b/Dockerfile-prod @@ -25,11 +25,11 @@ COPY . /app # Build the project and copy the files RUN npm run ng build -- --deploy-url=/ --c production -FROM bitnami/nginx:latest +FROM bitnamilegacy/nginx:latest #!/bin/sh -COPY ./.nginx/nginx.conf /opt/bitnami/nginx/conf/server_blocks/frontend.conf +COPY ./.nginx/nginx.conf /opt/bitnamilegacy/nginx/conf/server_blocks/frontend.conf ## Remove default nginx index page # RUN rm -rf /app/* diff --git a/src/app/admin/organisation/organisation.service.ts b/src/app/admin/organisation/organisation.service.ts index 014300d0..c1df57ae 100644 --- a/src/app/admin/organisation/organisation.service.ts +++ b/src/app/admin/organisation/organisation.service.ts @@ -9,7 +9,6 @@ import { } from "./organisation.model"; import { map, shareReplay } from "rxjs/operators"; import { UserMinimalService } from "../users/user-minimal.service"; -import { UpdateUserOrgsDto } from "../users/user.model"; @Injectable({ providedIn: "root", @@ -41,10 +40,6 @@ export class OrganisationService { ); } - getMinimal(): Observable { - return this.restService.get(this.URLMINIMAL, {}).pipe(shareReplay(1)); - } - getMinimalNoPerm(): Observable { return this.restService.get(this.URLMINIMAL_NEWKOMBIT, {}).pipe(shareReplay(1)); } diff --git a/src/app/admin/users/accept-user/accept-user.component.ts b/src/app/admin/users/accept-user/accept-user.component.ts index b713ac64..87d7d9da 100644 --- a/src/app/admin/users/accept-user/accept-user.component.ts +++ b/src/app/admin/users/accept-user/accept-user.component.ts @@ -70,7 +70,7 @@ export class AcceptUserComponent implements OnInit, OnDestroy { } private getUser(id: number) { - this.subscription = this.userService.getOne(id, false).subscribe(response => { + this.subscription = this.userService.getOne(id).subscribe(response => { this.user = response; }); } diff --git a/src/app/admin/users/user-detail/user-detail.component.ts b/src/app/admin/users/user-detail/user-detail.component.ts index 91ff9584..b2bbf072 100644 --- a/src/app/admin/users/user-detail/user-detail.component.ts +++ b/src/app/admin/users/user-detail/user-detail.component.ts @@ -74,7 +74,7 @@ export class UserDetailComponent implements OnInit, OnDestroy { } private getUser(id: number) { - this.subscription = this.userService.getOne(id, true).subscribe(response => { + this.subscription = this.userService.getOne(id).subscribe(response => { this.user = response; this.isLoadingResults = false; }); diff --git a/src/app/admin/users/user-minimal.service.ts b/src/app/admin/users/user-minimal.service.ts index 1ba2b705..42b018aa 100644 --- a/src/app/admin/users/user-minimal.service.ts +++ b/src/app/admin/users/user-minimal.service.ts @@ -7,16 +7,11 @@ import { UserMinimal, UserMinimalResponse } from "./user-minimal.model"; providedIn: "root", }) export class UserMinimalService { - URL = "user/minimal"; URL_NEW_KOMBIT = "kombitCreation/minimalUsers"; private userMinimalList: UserMinimal[]; constructor(private restService: RestService) {} - getUserMinimalRest(): Observable { - return this.restService.get(this.URL); - } - getUserMinimalRestNewKombit(): Observable { return this.restService.get(this.URL_NEW_KOMBIT); } diff --git a/src/app/admin/users/user.service.ts b/src/app/admin/users/user.service.ts index 804e7848..13daa2e8 100644 --- a/src/app/admin/users/user.service.ts +++ b/src/app/admin/users/user.service.ts @@ -32,8 +32,8 @@ export class UserService { }); } - getOne(id: number, extendedInfo = false): Observable { - return this.restService.get(this.URL, { extendedInfo }, id).pipe( + getOne(id: number): Observable { + return this.restService.get(this.URL, undefined, id).pipe( map((response: UserResponse) => { response.createdByName = this.userMinimalService.getUserNameFrom(response.createdBy); response.updatedByName = this.userMinimalService.getUserNameFrom(response.updatedBy); diff --git a/src/app/payload-decoder/payload-device-datatarget.service.ts b/src/app/payload-decoder/payload-device-datatarget.service.ts index 2ce5de45..77afbce7 100644 --- a/src/app/payload-decoder/payload-device-datatarget.service.ts +++ b/src/app/payload-decoder/payload-device-datatarget.service.ts @@ -20,10 +20,6 @@ export class PayloadDeviceDatatargetService { constructor(private restService: RestService) {} - get(id: number): Observable { - return this.restService.get(this.BASEURL, null, id); - } - put(payloadDeviceDatatarget: PayloadDeviceDatatarget): Observable { return this.restService.put(this.BASEURL, payloadDeviceDatatarget, payloadDeviceDatatarget.id, { observe: "response", @@ -49,17 +45,4 @@ export class PayloadDeviceDatatargetService { appendCopiedIoTDevice(id: number, dto: AppendCopiedDeviceDto): Observable { return this.restService.put(this.BASEURL + this.APPENDCOPIEDIOTDEVICEURL, dto, id); } - - mapToDatatargetDevicePayload(dto: PayloadDeviceDatatargetGetManyResponse): PayloadDeviceDatatarget[] { - const payloadDeviceDatatargetList = []; - dto.data.forEach(element => { - payloadDeviceDatatargetList.push({ - id: element.id, - iotDeviceIds: element.iotDevices.map(x => x.id), - payloadDecoderId: element.payloadDecoder?.id, - dataTargetId: element.dataTarget.id, - }); - }); - return payloadDeviceDatatargetList; - } } diff --git a/src/app/shared/services/me.service.ts b/src/app/shared/services/me.service.ts index 8cd9411c..669b4433 100644 --- a/src/app/shared/services/me.service.ts +++ b/src/app/shared/services/me.service.ts @@ -8,7 +8,6 @@ import { SharedVariableService } from "@shared/shared-variable/shared-variable.s providedIn: "root", }) export class MeService { - private user: UserResponse; constructor(private sharedVariableService: SharedVariableService) {} diff --git a/src/app/shared/services/sigfox.service.ts b/src/app/shared/services/sigfox.service.ts index f873d256..3f75c15a 100644 --- a/src/app/shared/services/sigfox.service.ts +++ b/src/app/shared/services/sigfox.service.ts @@ -59,13 +59,11 @@ export class SigfoxService { public postDeviceType(sigfoxGroup: SigfoxDeviceType): Observable { const url = this.SIGFOXDEVICETYPEURL + "?groupId=" + sigfoxGroup.groupId.toString(); - console.log(url); return this.restService.post(url, sigfoxGroup, { observe: "response" }); } public putDeviceType(sigfoxGroup: SigfoxDeviceType): Observable { const url = this.SIGFOXDEVICETYPEURL + "/" + sigfoxGroup.id + "?groupId=" + sigfoxGroup.groupId; - console.log(url); return this.restService.put(url, sigfoxGroup); } } From 47b51443bd03211a28ad0e34d43707530172aced Mon Sep 17 00:00:00 2001 From: August Andersen Date: Mon, 3 Nov 2025 10:43:32 +0100 Subject: [PATCH 2/3] npm i --- package-lock.json | 98 ++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index fce4ffec..b2b55332 100644 --- a/package-lock.json +++ b/package-lock.json @@ -521,7 +521,6 @@ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-20.3.7.tgz", "integrity": "sha512-i655RaL0zmLE3OESUlDnRNBDRIMW/67nTQvMqP6V1cQ42l2+SMJtREsxmX6cWt55/qvvgeytAA6aBN4aerBl5A==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -650,7 +649,6 @@ "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", @@ -742,7 +740,6 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-20.2.10.tgz", "integrity": "sha512-d95C2r3JP11KCahouWmPaxswz/EE7Zn1k8ocoGt70jl33x42Sg96vAHeOpnQ4yfrdA4W7Q+eWB/NqqvAGCzOPQ==", "license": "MIT", - "peer": true, "dependencies": { "parse5": "^8.0.0", "tslib": "^2.3.0" @@ -793,7 +790,6 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.7.tgz", "integrity": "sha512-uf8dXYTJbedk/wudkt2MfbtvN/T97aEZBtOTq8/IFQQZ3722rag6D+Cg76e5hBccROOn+ueGJX2gpxz02phTwA==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -810,7 +806,6 @@ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-20.3.7.tgz", "integrity": "sha512-EouHO15dUsgnFArj0M25R8cOPVoUfiFYSt6iXnMO8+S4dY1fDEmbFqkW5smlP66HL5Gys59Nwb5inejfIWHrLw==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -823,7 +818,6 @@ "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.7.tgz", "integrity": "sha512-viZwWlwc1BAqryRJE0Wq2WgAxDaW9fuwtYHYrOWnIn9sy9KemKmR6RmU9VRydrwUROOlqK49R9+RC1wQ6sYwqA==", "license": "MIT", - "peer": true, "dependencies": { "@babel/core": "7.28.3", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -856,7 +850,6 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.7.tgz", "integrity": "sha512-2UuYzC2A5SUtu33tYTN411Wk0WilA+2Uld/GP3O6mragw1O7v/M8pMFmbe9TR5Ah/abRJIocWGlNqeztZmQmrw==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -882,7 +875,6 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.7.tgz", "integrity": "sha512-uOCGCoqXeAWIlQMWiIeed/W8g8h2tk91YemMI+Ce1VQ/36Xfft40Bouz4eKcvJV6kLXGygdpWjzFGz32CE+3Og==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -901,7 +893,6 @@ "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.7.tgz", "integrity": "sha512-FYuuwU9ujiVT+0xjMIutaUT2PErV4AvxeAPWMlYRA1/yQxqn1VyNUd6kHPjAV+yrZg9Q0MDco2/c0Lh8rmAhSA==", "license": "MIT", - "peer": true, "dependencies": { "@babel/core": "7.28.3", "@types/babel__core": "7.20.5", @@ -926,7 +917,6 @@ "resolved": "https://registry.npmjs.org/@angular/material/-/material-20.2.10.tgz", "integrity": "sha512-WkJfUu7KiQY2lqHjMZtEKBG653sPmky0nytTMASsfQ/xUs56W3CAAEOuKhSyCNKsNeFJZS/NgJnvlpRzcE5k6g==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -958,7 +948,6 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.7.tgz", "integrity": "sha512-AbLtyR7fVEGDYyrz95dP2pc69J5XIjLLsFNAuNQPzNX02WPoAxtrWrNY6UnTzGoSrCc5F52hiL2Uo6yPZTiJcg==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -1052,7 +1041,6 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz", "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==", "license": "MIT", - "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -3628,7 +3616,6 @@ "integrity": "sha512-nqhDw2ZcAUrKNPwhjinJny903bRhI0rQhiDz1LksjeRxqa36i3l75+4iXbOy0rlDpLJGxqtgoPavQjmmyS5UJw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@inquirer/checkbox": "^4.2.1", "@inquirer/confirm": "^5.1.14", @@ -5463,7 +5450,6 @@ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "license": "MIT", - "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -6243,7 +6229,6 @@ "integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -6597,7 +6582,6 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -6686,7 +6670,6 @@ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -6861,6 +6844,7 @@ "integrity": "sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">= 6.0.0" } @@ -6885,6 +6869,7 @@ "integrity": "sha512-majUxHgLehQTeSA+hClx+DY09OVUqG3GtezWkF1krgLGNdlDu9l9V8DaqNMWbq4Eddc8wsyDA0hpDUtnYxQEXw==", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "ast-types-flow": "0.0.7", "commander": "^2.11.0" @@ -6902,7 +6887,8 @@ "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", "dev": true, - "license": "ISC" + "license": "ISC", + "peer": true }, "node_modules/autoprefixer": { "version": "10.4.21", @@ -6948,6 +6934,7 @@ "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "ast-types-flow": "0.0.7" } @@ -7211,7 +7198,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.19", "caniuse-lite": "^1.0.30001751", @@ -7239,6 +7225,7 @@ "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -7665,6 +7652,7 @@ "integrity": "sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@angular/compiler": "9.0.0", "@angular/core": "9.0.0", @@ -7693,6 +7681,7 @@ "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==", "dev": true, "license": "MIT", + "peer": true, "peerDependencies": { "tslib": "^1.10.0" } @@ -7703,6 +7692,7 @@ "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==", "dev": true, "license": "MIT", + "peer": true, "peerDependencies": { "rxjs": "^6.5.3", "tslib": "^1.10.0", @@ -7729,6 +7719,7 @@ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", "dev": true, "license": "BSD-3-Clause", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -8183,6 +8174,7 @@ "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cssesc": "^3.0.0", "fastparse": "^1.1.2" @@ -8207,6 +8199,7 @@ "integrity": "sha512-Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "through": "X.X.X" } @@ -8236,7 +8229,8 @@ "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", "dev": true, - "license": "BSD-2-Clause" + "license": "BSD-2-Clause", + "peer": true }, "node_modules/date-format": { "version": "4.0.14", @@ -8865,7 +8859,6 @@ "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -8998,6 +8991,7 @@ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, "license": "BSD-2-Clause", + "peer": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -9133,7 +9127,6 @@ "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.0", @@ -9267,7 +9260,8 @@ "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/fastq": { "version": "1.19.1", @@ -10570,8 +10564,7 @@ "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.12.0.tgz", "integrity": "sha512-QqO4pX33GEML5JoGQU6BM5NHKPgEsg+TXp3jCIDek9MbfEp2JUYEFBo9EF1+hegWy/bCHS1m5nP0BOp18G6rVA==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/jasmine-spec-reporter": { "version": "7.0.0", @@ -10716,7 +10709,6 @@ "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", "dev": true, "license": "MIT", - "peer": true, "bin": { "jiti": "bin/jiti.js" } @@ -10837,7 +10829,6 @@ "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@colors/colors": "1.5.0", "body-parser": "^1.19.0", @@ -11340,8 +11331,7 @@ "version": "1.9.4", "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", - "license": "BSD-2-Clause", - "peer": true + "license": "BSD-2-Clause" }, "node_modules/leaflet-geosearch": { "version": "3.6.1", @@ -11374,7 +11364,6 @@ "integrity": "sha512-kdTwsyRuncDfjEs0DlRILWNvxhDG/Zij4YLO4TMJgDLW+8OzpfkdPnRgrsRuY1o+oaxJGWsps5f/RVBgGmmN0w==", "dev": true, "license": "Apache-2.0", - "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -11519,7 +11508,6 @@ "integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", @@ -12251,7 +12239,6 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "license": "MIT", - "peer": true, "engines": { "node": "*" } @@ -12260,8 +12247,7 @@ "version": "0.52.2", "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.2.tgz", "integrity": "sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/mrmime": { "version": "2.0.1", @@ -13393,7 +13379,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -14111,7 +14096,6 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", "license": "Apache-2.0", - "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -14168,7 +14152,6 @@ "integrity": "sha512-9GUyuksjw70uNpb1MTYWsH9MQHOHY6kwfnkafC24+7aOMZn9+rVMBxRbLvw756mrBFbIsFg6Xw9IkR2Fnn3k+Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -14310,6 +14293,7 @@ "integrity": "sha512-e8BOaTo007E3dMuQQTnPdalbKTABKNS7UxoBIDnwOqRa+QwMrCPjynB8zAlPF6xlqUfdLPPLIJ13hJNmhtq8Ng==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "semver": "^5.3.0" } @@ -14320,6 +14304,7 @@ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "license": "ISC", + "peer": true, "bin": { "semver": "bin/semver" } @@ -15055,7 +15040,8 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", "dev": true, - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/ssri": { "version": "12.0.0", @@ -15413,7 +15399,6 @@ "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.14.0", @@ -15484,7 +15469,8 @@ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/thunky": { "version": "1.1.0", @@ -15617,8 +15603,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD", - "peer": true + "license": "0BSD" }, "node_modules/tslint": { "version": "6.1.3", @@ -15683,6 +15668,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "color-convert": "^1.9.0" }, @@ -15696,6 +15682,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "sprintf-js": "~1.0.2" } @@ -15706,6 +15693,7 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -15721,6 +15709,7 @@ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "color-name": "1.1.3" } @@ -15730,7 +15719,8 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/tslint/node_modules/escape-string-regexp": { "version": "1.0.5", @@ -15738,6 +15728,7 @@ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=0.8.0" } @@ -15748,6 +15739,7 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=4" } @@ -15758,6 +15750,7 @@ "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -15772,6 +15765,7 @@ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "license": "ISC", + "peer": true, "bin": { "semver": "bin/semver" } @@ -15781,7 +15775,8 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true, - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/tslint/node_modules/supports-color": { "version": "5.5.0", @@ -15789,6 +15784,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "has-flag": "^3.0.0" }, @@ -15801,7 +15797,8 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true, - "license": "0BSD" + "license": "0BSD", + "peer": true }, "node_modules/tsutils": { "version": "2.29.0", @@ -15809,6 +15806,7 @@ "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "tslib": "^1.8.1" }, @@ -15821,7 +15819,8 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true, - "license": "0BSD" + "license": "0BSD", + "peer": true }, "node_modules/tuf-js": { "version": "3.1.0", @@ -15879,7 +15878,6 @@ "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "devOptional": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -16148,7 +16146,6 @@ "integrity": "sha512-4JLXU0tD6OZNVqlwzm3HGEhAHufSiyv+skb7q0d2367VDMzrU1Q/ZeepvkcHH0rZie6uqEtTQQe0OEOOluH3Mg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -16251,7 +16248,6 @@ "integrity": "sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/bonjour": "^3.5.13", "@types/connect-history-api-fallback": "^1.5.4", @@ -17217,7 +17213,6 @@ "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", "dev": true, "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -17236,8 +17231,7 @@ "version": "0.15.1", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.1.tgz", "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==", - "license": "MIT", - "peer": true + "license": "MIT" } } } From 78b859286d04b42fb18f8fc6504fb524c51df9f1 Mon Sep 17 00:00:00 2001 From: August Andersen Date: Mon, 3 Nov 2025 12:08:10 +0100 Subject: [PATCH 3/3] cleanup --- src/app/admin/organisation/organisation.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/admin/organisation/organisation.service.ts b/src/app/admin/organisation/organisation.service.ts index 53e083df..3e69fc19 100644 --- a/src/app/admin/organisation/organisation.service.ts +++ b/src/app/admin/organisation/organisation.service.ts @@ -15,7 +15,6 @@ import { UserMinimalService } from "../users/user-minimal.service"; }) export class OrganisationService { URL = "organization"; - URLMINIMAL = "organization/minimal"; URLMINIMAL_NEWKOMBIT = "kombitCreation/minimal"; constructor(private restService: RestService, private userMinimalService: UserMinimalService) {}