From 6bccc2e9801bdeb3726e5c8c87fcaf6a18bbcd09 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 22 May 2024 15:02:49 +0300 Subject: [PATCH 1/3] description template editor dirty field after save bug dix --- .../field/description-template-editor-field.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts index cce25cfda..cfc5bcb06 100644 --- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts @@ -245,7 +245,6 @@ export class DescriptionTemplateEditorFieldComponent extends BaseComponent imple validationsControl.setValue(validations.filter(validator => validator != validationType)); validationsControl.updateValueAndValidity(); } - this.form.markAsDirty();//deactivate guard } get isRequired() { From 757eab20698ea19ec01ea10a430e81d295b87f7e Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Wed, 22 May 2024 15:25:04 +0300 Subject: [PATCH 2/3] Adding swagger groups to segregate the public API docs from the authenticated one. Exposing only dmp and description endpoints. --- backend/web/src/main/resources/config/swagger.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/backend/web/src/main/resources/config/swagger.yml b/backend/web/src/main/resources/config/swagger.yml index c570425f0..f944323e0 100644 --- a/backend/web/src/main/resources/config/swagger.yml +++ b/backend/web/src/main/resources/config/swagger.yml @@ -1,6 +1,17 @@ springdoc: - packagesToScan: org.opencdmp.controllers.publicapi - pathsToScan: "/api/public/(dmps|datasets)/?.*" + apiDocs: + groups: + enabled: true + groupConfigs: + - group: public-api + displayName: Public API + packagesToScan: org.opencdmp.controllers.publicapi + pathsToMatch: "/api/public/dmps/**, /api/public/datasets/**" + - group: internal-api + displayName: Internal API + packagesToScan: org.opencdmp.controllers + packagesToExclude: org.opencdmp.controllers.publicapi + pathsToMatch: "/api/dmp/**, /api/description/**" swagger-ui: enabled: true useRootPath: true From d50b6b307a15f5e70a4fe21b855351c2cb9fde16 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 22 May 2024 15:31:40 +0300 Subject: [PATCH 3/3] fix dmp clone, new version from dashboard --- dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts | 2 ++ .../recent-edited-activity/recent-edited-activity.component.ts | 2 ++ .../recent-edited-dmp-activity.component.ts | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts index c8abfb156..e98a401e0 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts @@ -135,6 +135,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { fields: [ [nameof(x => x.dmp), nameof(x => x.id)].join('.'), [nameof(x => x.dmp), nameof(x => x.label)].join('.'), + [nameof(x => x.dmp), nameof(x => x.description)].join('.'), [nameof(x => x.dmp), nameof(x => x.status)].join('.'), [nameof(x => x.dmp), nameof(x => x.accessType)].join('.'), [nameof(x => x.dmp), nameof(x => x.version)].join('.'), @@ -142,6 +143,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { [nameof(x => x.dmp), nameof(x => x.groupId)].join('.'), [nameof(x => x.dmp), nameof(x => x.updatedAt)].join('.'), [nameof(x => x.dmp), nameof(x => x.isActive)].join('.'), + [nameof(x => x.dmp), nameof(x => x.hash)].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.CreateNewVersionDmp].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.DeleteDmp].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.CloneDmp].join('.'), diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index 9c825c99a..1d6fdb0ce 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -137,6 +137,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn fields: [ [nameof(x => x.dmp), nameof(x => x.id)].join('.'), [nameof(x => x.dmp), nameof(x => x.label)].join('.'), + [nameof(x => x.dmp), nameof(x => x.description)].join('.'), [nameof(x => x.dmp), nameof(x => x.status)].join('.'), [nameof(x => x.dmp), nameof(x => x.accessType)].join('.'), [nameof(x => x.dmp), nameof(x => x.version)].join('.'), @@ -144,6 +145,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn [nameof(x => x.dmp), nameof(x => x.groupId)].join('.'), [nameof(x => x.dmp), nameof(x => x.updatedAt)].join('.'), [nameof(x => x.dmp), nameof(x => x.isActive)].join('.'), + [nameof(x => x.dmp), nameof(x => x.hash)].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.CreateNewVersionDmp].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.DeleteDmp].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.CloneDmp].join('.'), diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts index 66e81c52a..6b6e4e5d1 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts @@ -139,12 +139,14 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O fields: [ [nameof(x => x.dmp), nameof(x => x.id)].join('.'), [nameof(x => x.dmp), nameof(x => x.label)].join('.'), + [nameof(x => x.dmp), nameof(x => x.description)].join('.'), [nameof(x => x.dmp), nameof(x => x.status)].join('.'), [nameof(x => x.dmp), nameof(x => x.versionStatus)].join('.'), [nameof(x => x.dmp), nameof(x => x.accessType)].join('.'), [nameof(x => x.dmp), nameof(x => x.version)].join('.'), [nameof(x => x.dmp), nameof(x => x.groupId)].join('.'), [nameof(x => x.dmp), nameof(x => x.updatedAt)].join('.'), + [nameof(x => x.dmp), nameof(x => x.hash)].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.CreateNewVersionDmp].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.DeleteDmp].join('.'), [nameof(x => x.dmp), nameof(x => x.authorizationFlags), AppPermission.CloneDmp].join('.'),