diff --git a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java index 57f76d3b65..72a14521da 100644 --- a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java +++ b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java @@ -85,15 +85,6 @@ public class ScmConfiguration implements Configuration { public static final String DEFAULT_ALERTS_URL = "https://alerts.scm-manager.org/api/v1/alerts"; - - /** - * SCM Manager alerts url. - * - * @since 2.32.0 - */ - public static final String DEFAULT_FEEDBACK_URL = - "https://response.cloudogu.com/api/v1/feedback/scm-manager/url"; - /** * SCM Manager release feed url */ @@ -190,14 +181,6 @@ public class ScmConfiguration implements Configuration { @XmlElement(name = "alerts-url") private String alertsUrl = DEFAULT_ALERTS_URL; - /** - * Url of the alerts api. - * - * @since 2.32.0 - */ - @XmlElement(name = "feedback-url") - private String feedbackUrl = DEFAULT_FEEDBACK_URL; - @XmlElement(name = "release-feed-url") private String releaseFeedUrl = DEFAULT_RELEASE_FEED_URL; @@ -305,7 +288,6 @@ public class ScmConfiguration implements Configuration { this.namespaceStrategy = other.namespaceStrategy; this.loginInfoUrl = other.loginInfoUrl; this.alertsUrl = other.alertsUrl; - this.feedbackUrl = other.feedbackUrl; this.releaseFeedUrl = other.releaseFeedUrl; this.mailDomainName = other.mailDomainName; this.emergencyContacts = other.emergencyContacts; @@ -396,17 +378,6 @@ public class ScmConfiguration implements Configuration { return alertsUrl; } - /** - * Returns the url of the feedback api. - * - * @return the feedback url. - * @since 2.32.0 - */ - public String getFeedbackUrl() { - return feedbackUrl; - } - - /** * Returns the url of the rss release feed. * @@ -651,16 +622,6 @@ public class ScmConfiguration implements Configuration { this.alertsUrl = alertsUrl; } - /** - * Set the url for the feedback api. - * - * @param feedbackUrl feedbackUrl url - * @since 2.32.0 - */ - public void setFeedbackUrl(String feedbackUrl) { - this.feedbackUrl = feedbackUrl; - } - public void setReleaseFeedUrl(String releaseFeedUrl) { this.releaseFeedUrl = releaseFeedUrl; } diff --git a/scm-ui/ui-api/src/config.test.ts b/scm-ui/ui-api/src/config.test.ts index 4081b5c453..604d9f9136 100644 --- a/scm-ui/ui-api/src/config.test.ts +++ b/scm-ui/ui-api/src/config.test.ts @@ -58,7 +58,6 @@ describe("Test config hooks", () => { proxyUser: null, realmDescription: "", alertsUrl: "", - feedbackUrl: "", releaseFeedUrl: "", skipFailedAuthenticators: false, _links: { diff --git a/scm-ui/ui-types/src/Config.ts b/scm-ui/ui-types/src/Config.ts index d7d1991b43..8d94d83aa2 100644 --- a/scm-ui/ui-types/src/Config.ts +++ b/scm-ui/ui-types/src/Config.ts @@ -50,7 +50,6 @@ export type Config = HalRepresentation & { namespaceStrategy: string; loginInfoUrl: string; alertsUrl: string; - feedbackUrl: string; releaseFeedUrl: string; mailDomainName: string; emergencyContacts: string[]; diff --git a/scm-ui/ui-webapp/public/locales/de/commons.json b/scm-ui/ui-webapp/public/locales/de/commons.json index 53efc8a1eb..54d5e4108c 100644 --- a/scm-ui/ui-webapp/public/locales/de/commons.json +++ b/scm-ui/ui-webapp/public/locales/de/commons.json @@ -174,10 +174,6 @@ "alerts": { "shieldTitle": "Alerts" }, - "feedback": { - "button": "Feedback", - "modalTitle": "Feedback senden" - }, "cardColumnGroup": { "showContent": "Inhalt einblenden", "hideContent": "Inhalt ausblenden" diff --git a/scm-ui/ui-webapp/public/locales/de/config.json b/scm-ui/ui-webapp/public/locales/de/config.json index 3c28f656e0..5e8398fde7 100644 --- a/scm-ui/ui-webapp/public/locales/de/config.json +++ b/scm-ui/ui-webapp/public/locales/de/config.json @@ -69,7 +69,6 @@ }, "skip-failed-authenticators": "Fehlgeschlagene Authentifizierer überspringen", "alerts-url": "Alerts URL", - "feedback-url": "Feedback URL", "release-feed-url": "Release Feed URL", "mail-domain-name": "Fallback E-Mail Domain Name", "enabled-xsrf-protection": "XSRF Protection aktivieren", @@ -96,7 +95,6 @@ "pluginUrlHelpText": "Die URL der Plugin Center API. Beschreibung der Platzhalter: version = SCM-Manager Version; os = Betriebssystem; arch = Architektur", "pluginAuthUrlHelpText": "Die URL der Plugin Center Authentifizierungs API.", "alertsUrlHelpText": "Die URL der Alerts API. Darüber wird über Alerts die Ihr System betreffen informiert. Um diese Funktion zu deaktivieren lassen Sie dieses Feld leer.", - "feedbackUrlHelpText": "Die URL der Feedback API. Dies ermöglicht es Feedback direkt an das SCM-Manager Team zu senden. Um diese Funktion zu deaktivieren lassen Sie dieses Feld leer.", "releaseFeedUrlHelpText": "Die URL des RSS Release Feed des SCM-Manager. Darüber wird über die neue SCM-Manager Version informiert. Um diese Funktion zu deaktivieren lassen Sie dieses Feld leer.", "mailDomainNameHelpText": "Dieser Domain Name wird genutzt, wenn für einen User eine E-Mail-Adresse benötigt wird, für den keine hinterlegt ist. Diese Domain wird nicht zum Versenden von E-Mails genutzt und auch keine anderweitige Verbindung aufgebaut.", "enableForwardingHelpText": "mod_proxy Port Weiterleitung aktivieren.", diff --git a/scm-ui/ui-webapp/public/locales/en/commons.json b/scm-ui/ui-webapp/public/locales/en/commons.json index c154e80a92..bed26f7b07 100644 --- a/scm-ui/ui-webapp/public/locales/en/commons.json +++ b/scm-ui/ui-webapp/public/locales/en/commons.json @@ -175,10 +175,6 @@ "alerts": { "shieldTitle": "Alerts" }, - "feedback": { - "button": "Feedback", - "modalTitle": "Share your feedback" - }, "cardColumnGroup": { "showContent": "Show content", "hideContent": "Hide content" diff --git a/scm-ui/ui-webapp/public/locales/en/config.json b/scm-ui/ui-webapp/public/locales/en/config.json index f3dbc87380..136d8cabd1 100644 --- a/scm-ui/ui-webapp/public/locales/en/config.json +++ b/scm-ui/ui-webapp/public/locales/en/config.json @@ -69,7 +69,6 @@ }, "skip-failed-authenticators": "Skip Failed Authenticators", "alerts-url": "Alerts URL", - "feedback-url": "Feedback URL", "release-feed-url": "Release Feed URL", "mail-domain-name": "Fallback Mail Domain Name", "enabled-xsrf-protection": "Enabled XSRF Protection", @@ -96,7 +95,6 @@ "pluginUrlHelpText": "The url of the Plugin Center API. Explanation of the placeholders: version = SCM-Manager Version; os = Operation System; arch = Architecture", "pluginAuthUrlHelpText": "The url of the Plugin Center authentication API.", "alertsUrlHelpText": "The url of the alerts api. This provides up-to-date alerts regarding your system. To disable this feature just leave the url blank.", - "feedbackUrlHelpText": "The url of the feedback api. This can be used to send feedback to the SCM-Manager team. To disable this feature just leave the url blank.", "releaseFeedUrlHelpText": "The url of the RSS Release Feed for SCM-Manager. This provides up-to-date version information. To disable this feature just leave the url blank.", "mailDomainNameHelpText": "This domain name will be used to create email addresses for users without one when needed. It will not be used to send mails nor will be accessed otherwise.", "enableForwardingHelpText": "Enable mod_proxy port forwarding.", diff --git a/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx b/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx index 9d34d00afa..63f55a2fa4 100644 --- a/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx +++ b/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx @@ -73,7 +73,6 @@ const ConfigForm: FC = ({ namespaceStrategy: "", loginInfoUrl: "", alertsUrl: "", - feedbackUrl: "", releaseFeedUrl: "", mailDomainName: "", emergencyContacts: [], @@ -154,7 +153,6 @@ const ConfigForm: FC = ({ enabledApiKeys={innerConfig.enabledApiKeys} emergencyContacts={innerConfig.emergencyContacts} namespaceStrategy={innerConfig.namespaceStrategy} - feedbackUrl={innerConfig.feedbackUrl} onChange={onChange} hasUpdatePermission={configUpdatePermission} /> diff --git a/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx index 40c1234ee4..ad5f2de91b 100644 --- a/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx +++ b/scm-ui/ui-webapp/src/admin/components/form/GeneralSettings.tsx @@ -42,7 +42,6 @@ type Props = { anonymousMode: AnonymousMode; skipFailedAuthenticators: boolean; alertsUrl: string; - feedbackUrl: string; releaseFeedUrl: string; mailDomainName: string; enabledXsrfProtection: boolean; @@ -60,7 +59,6 @@ const GeneralSettings: FC = ({ loginInfoUrl, anonymousMode, alertsUrl, - feedbackUrl, releaseFeedUrl, mailDomainName, enabledXsrfProtection, @@ -96,9 +94,6 @@ const GeneralSettings: FC = ({ const handleAlertsUrlChange = (value: string) => { onChange(true, value, "alertsUrl"); }; - const handleFeedbackUrlChange = (value: string) => { - onChange(true, value, "feedbackUrl"); - }; const handleReleaseFeedUrlChange = (value: string) => { onChange(true, value, "releaseFeedUrl"); }; @@ -236,17 +231,6 @@ const GeneralSettings: FC = ({ /> -
-
- -
-
{
{content}
- {isAuthenticated ? : null}