From 9c9c3f159d73279b19520649e09349f5e6ad1116 Mon Sep 17 00:00:00 2001
From: Lukasz Lopatowski <llopat@man.poznan.pl>
Date: Wed, 28 May 2025 13:57:48 +0200
Subject: [PATCH] Temporarily disabled domain group creation webhook
---
.../nmaas/portal/service/impl/DomainGroupServiceImpl.java | 4 ++--
src/test/shell/data/i18n/de.json | 4 ++--
src/test/shell/data/i18n/en.json | 6 +++---
src/test/shell/data/i18n/fr.json | 4 ++--
src/test/shell/data/i18n/pl.json | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java b/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java
index 9650e945a..fec8af2e2 100644
--- a/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java
+++ b/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java
@@ -64,8 +64,8 @@ public class DomainGroupServiceImpl implements DomainGroupService {
domainGroupEntity = domainGroupRepository.save(domainGroupEntity);
//call existing webhooks
- DomainGroupView domainGroupView = modelMapper.map(domainGroupEntity, DomainGroupView.class);
- webhookEventRepository.findIdByEventType(WebhookEventType.DOMAIN_GROUP_CHANGE).forEach(id -> scheduleManager.createOneTimeJob(DomainGroupJob.class, "DomainGroup_" + id + "_" + domainGroupView.getId() + "_" + LocalDateTime.now(), Map.of("webhookId", id, "action", "create", "domainGroup", domainGroupView)));
+ //DomainGroupView domainGroupView = modelMapper.map(domainGroupEntity, DomainGroupView.class);
+ //webhookEventRepository.findIdByEventType(WebhookEventType.DOMAIN_GROUP_CHANGE).forEach(id -> scheduleManager.createOneTimeJob(DomainGroupJob.class, "DomainGroup_" + id + "_" + domainGroupView.getId() + "_" + LocalDateTime.now(), Map.of("webhookId", id, "action", "create", "domainGroup", domainGroupView)));
return modelMapper.map(domainGroupEntity, DomainGroupView.class);
}
diff --git a/src/test/shell/data/i18n/de.json b/src/test/shell/data/i18n/de.json
index 1952c4515..3c41aede4 100644
--- a/src/test/shell/data/i18n/de.json
+++ b/src/test/shell/data/i18n/de.json
@@ -1327,7 +1327,7 @@
"DOMAIN_GROUP_CHANGE" : "Domain group change",
"NEW" : "Add webhook",
"DETAILS" : "Webhooks details",
- "SAVE" : "Save webhook",
- "REMOVE" : "Remove webhook"
+ "SAVE" : "Save",
+ "REMOVE" : "Remove"
}
}
diff --git a/src/test/shell/data/i18n/en.json b/src/test/shell/data/i18n/en.json
index a1d6c311a..d3c53fa9c 100644
--- a/src/test/shell/data/i18n/en.json
+++ b/src/test/shell/data/i18n/en.json
@@ -1322,7 +1322,7 @@
"TITLE_SHORT" : "Webhooks",
"ID" : "Id",
"NAME" : "Name",
- "TARGET_URL" : "Target Url",
+ "TARGET_URL" : "Target url",
"TYPE" : "Webhook type",
"TOKEN" : "Token value",
"AUTH" : "Authorization header",
@@ -1332,7 +1332,7 @@
"DOMAIN_GROUP_CHANGE" : "Domain group change",
"NEW" : "Add webhook",
"DETAILS" : "Webhooks details",
- "SAVE" : "Save webhook",
- "REMOVE" : "Remove webhook"
+ "SAVE" : "Save",
+ "REMOVE" : "Remove"
}
}
diff --git a/src/test/shell/data/i18n/fr.json b/src/test/shell/data/i18n/fr.json
index f17ba3fb1..bb3d002a5 100644
--- a/src/test/shell/data/i18n/fr.json
+++ b/src/test/shell/data/i18n/fr.json
@@ -1331,7 +1331,7 @@
"DOMAIN_GROUP_CHANGE" : "Domain group change",
"NEW" : "Add webhook",
"DETAILS" : "Webhooks details",
- "SAVE" : "Save webhook",
- "REMOVE" : "Remove webhook"
+ "SAVE" : "Save",
+ "REMOVE" : "Remove"
}
}
diff --git a/src/test/shell/data/i18n/pl.json b/src/test/shell/data/i18n/pl.json
index 9785607ab..251192c6f 100644
--- a/src/test/shell/data/i18n/pl.json
+++ b/src/test/shell/data/i18n/pl.json
@@ -1331,7 +1331,7 @@
"DOMAIN_GROUP_CHANGE" : "Domain group change",
"NEW" : "Add webhook",
"DETAILS" : "Webhooks details",
- "SAVE" : "Save webhook",
- "REMOVE" : "Remove webhook"
+ "SAVE" : "Save",
+ "REMOVE" : "Remove"
}
}
--
GitLab