-
+
Channel already exists.
Enter a valid channel.
Channel is required.
diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/dialogs/add-channel.component.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/dialogs/add-channel.component.ts
index d9f609a32..15322a63e 100644
--- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/dialogs/add-channel.component.ts
+++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/dialogs/add-channel.component.ts
@@ -18,6 +18,8 @@
import {Component, ElementRef, EventEmitter, Output, QueryList, ViewChildren} from "@angular/core";
import {ModalDirective} from "ngx-bootstrap";
import {AaiDocument} from "apicurio-data-models";
+import {ConfigService} from "../../../../../../services/config.service";
+
@Component({
moduleId: module.id,
@@ -33,11 +35,16 @@ export class AddChannelDialogComponent {
private _isOpen: boolean = false;
- channel: string = "";
+ channelRegex: string = "";
+ channel: string = "";
channels: string[] = [];
channelExists: boolean = false;
+ constructor(configService: ConfigService){
+ this.channelRegex = configService.channelNameValidation();
+ }
+
/**
* Called to open the dialog.
* @param document
@@ -111,4 +118,8 @@ export class AddChannelDialogComponent {
validateChannel(newChannel: string) {
this.channelExists = this.channels.indexOf(newChannel) != -1;
}
+
+ channelValidation(): string{
+ return this.channelRegex;
+ }
}
diff --git a/front-end/studio/src/app/services/config.service.ts b/front-end/studio/src/app/services/config.service.ts
index c8771d66e..539a076cf 100644
--- a/front-end/studio/src/app/services/config.service.ts
+++ b/front-end/studio/src/app/services/config.service.ts
@@ -29,7 +29,8 @@ let DEFAULT_CONFIG: any = {
editingUrl: "http://localhost:8080/api-editing",
},
ui: {
- uiUrl: "http://localhost:8080/studio/"
+ uiUrl: "http://localhost:8080/studio/",
+ channelNameValidation: '([^{}\\/]*(\\{[a-zA-Z_][0-9a-zA-Z_]*\\})?)+',
},
features: {
"microcks": true,
@@ -153,4 +154,11 @@ export class ConfigService {
}
return this.config.features.shareWithEveryone;
}
+
+ public channelNameValidation() :string {
+ if (!this.config.ui.channelNameValidation || !this.config.ui.channelNameValidation) {
+ return "";
+ }
+ return this.config.ui.channelNameValidation;
+ }
}
diff --git a/platforms/quarkus/ui/src/main/resources/application.properties b/platforms/quarkus/ui/src/main/resources/application.properties
index a73cdaaba..cef5cc31d 100644
--- a/platforms/quarkus/ui/src/main/resources/application.properties
+++ b/platforms/quarkus/ui/src/main/resources/application.properties
@@ -6,6 +6,7 @@
#apicurio
%dev.apicurio-ui.editing.url=${APICURIO_UI_EDITING_URL:http://localhost:8091/api}
%dev.apicurio-ui.hub-api.url=${APICURIO_UI_HUB_API_URL:https://localhost:8092/ws}
+%dev.apicurio-ui.validation.channelName.regexp=${APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP:}
# === Prod profile
@@ -13,6 +14,7 @@
%prod.quarkus.oidc.client-id=${APICURIO_KC_CLIENT_ID}
%prod.apicurio-ui.editing.url=${APICURIO_UI_EDITING_URL:}
%prod.apicurio-ui.hub-api.url=${APICURIO_UI_HUB_API_URL:}
+%prod.apicurio-ui.validation.channelName.regexp=${APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP:}
quarkus.oidc.application-type=web-app
quarkus.http.cors=true
diff --git a/platforms/thorntail/api/Dockerfile b/platforms/thorntail/api/Dockerfile
index 1e568d18d..69f5afc34 100644
--- a/platforms/thorntail/api/Dockerfile
+++ b/platforms/thorntail/api/Dockerfile
@@ -43,6 +43,7 @@ ENV APICURIO_MAX_HEAP=2048m
ENV APICURIO_GITHUB_API_URL=
ENV APICURIO_GITLAB_API_URL=
ENV APICURIO_BITBUCKET_API_URL=
+ENV APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP='([^{}\/]*(\{[a-zA-Z_][0-9a-zA-Z_]*\})?)+'
CMD java -jar /opt/apicurio/apicurio-studio-api-thorntail.jar \
diff --git a/platforms/thorntail/ui/Dockerfile b/platforms/thorntail/ui/Dockerfile
index ae3165a39..90e1631bc 100644
--- a/platforms/thorntail/ui/Dockerfile
+++ b/platforms/thorntail/ui/Dockerfile
@@ -32,6 +32,8 @@ ENV APICURIO_UI_HUB_API_URL=https://localhost:8443/api
ENV APICURIO_UI_EDITING_URL=https://localhost:8443/ws
ENV APICURIO_MIN_HEAP=512m
ENV APICURIO_MAX_HEAP=2048m
+ENV APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP='([^{}\/]*(\{[a-zA-Z_][0-9a-zA-Z_]*\})?)+'
+
CMD java -jar /opt/apicurio/apicurio-studio-ui-thorntail.jar \
diff --git a/platforms/thorntail/ui/README.md b/platforms/thorntail/ui/README.md
index bbffad97a..2b0927ad9 100644
--- a/platforms/thorntail/ui/README.md
+++ b/platforms/thorntail/ui/README.md
@@ -28,6 +28,7 @@ The following environment variables control configuration of the app:
APICURIO_LOGGING_LEVEL=INFO
APICURIO_UI_LOGOUT_REDIRECT_URI=/logout
APICURIO_UI_HUB_UI_URL=http://localhost:8080
+ APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP='([^{}\/]*(\{[a-zA-Z_][0-9a-zA-Z_]*\})?)+'
APICURIO_UI_HUB_API_URL=http://localhost:8090/
APICURIO_UI_EDITING_URL=http://localhost:8091/
APICURIO_UI_FEATURE_MICROCKS=false
diff --git a/shared/beans/src/main/java/io/apicurio/studio/shared/beans/StudioConfigUi.java b/shared/beans/src/main/java/io/apicurio/studio/shared/beans/StudioConfigUi.java
index 824a6276a..ab19b0005 100644
--- a/shared/beans/src/main/java/io/apicurio/studio/shared/beans/StudioConfigUi.java
+++ b/shared/beans/src/main/java/io/apicurio/studio/shared/beans/StudioConfigUi.java
@@ -28,6 +28,8 @@
public class StudioConfigUi {
private String url;
+
+ private String channelNameValidation;
/**
* Constructor.
@@ -49,4 +51,20 @@ public void setUrl(String url) {
this.url = url;
}
+ /**
+ * @return the channel Name Regex
+ */
+ public String getChannelNameValidation() {
+ return channelNameValidation;
+ }
+
+ /**
+ * @param channelNameRegex the channel Name Regex to set
+ */
+ public void setChannelNameValidation(String channelNameValidation) {
+ this.channelNameValidation = channelNameValidation;
+ }
+
+
+
}