web/satellite: change banner for beta satellites with URLs

WHAT: beta satellite top banner's copy is changed to include support/feedback URLs WHY: so users using our beta satellite will be able to report feedback somewhere Change-Id: Ibc349c8b3354b577275fcf1d2b75bfdd267729d9
storj · Mar 15, 2021 · 6a553ec · 6a553ec
1 parent 1de6315
commit 6a553ec
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 2 deletions.
diff --git a/satellite/console/consoleweb/server.go b/satellite/console/consoleweb/server.go
@@ -83,6 +83,8 @@ type Config struct {
 	ProjectLimitsIncreaseRequestURL string `help:"url link to project limit increase request page" default:"https://support.tardigrade.io/hc/en-us/requests/new?ticket_form_id=360000683212"`
 	GatewayCredentialsRequestURL    string `help:"url link for gateway credentials requests" default:"https://auth.tardigradeshare.io"`
 	IsBetaSatellite                 bool   `help:"indicates if satellite is in beta" default:"false"`
+	BetaSatelliteFeedbackURL        string `help:"url link for for beta satellite feedback" default:""`
+	BetaSatelliteSupportURL         string `help:"url link for for beta satellite support" default:""`
 
 	RateLimit web.IPRateLimiterConfig
 
@@ -290,6 +292,8 @@ func (server *Server) appHandler(w http.ResponseWriter, r *http.Request) {
 		ProjectLimitsIncreaseRequestURL string
 		GatewayCredentialsRequestURL    string
 		IsBetaSatellite                 bool
+		BetaSatelliteFeedbackURL        string
+		BetaSatelliteSupportURL         string
 	}
 
 	data.ExternalAddress = server.config.ExternalAddress
@@ -305,6 +309,8 @@ func (server *Server) appHandler(w http.ResponseWriter, r *http.Request) {
 	data.ProjectLimitsIncreaseRequestURL = server.config.ProjectLimitsIncreaseRequestURL
 	data.GatewayCredentialsRequestURL = server.config.GatewayCredentialsRequestURL
 	data.IsBetaSatellite = server.config.IsBetaSatellite
+	data.BetaSatelliteFeedbackURL = server.config.BetaSatelliteFeedbackURL
+	data.BetaSatelliteSupportURL = server.config.BetaSatelliteSupportURL
 
 	if server.templates.index == nil {
 		server.log.Error("index template is not set")

diff --git a/scripts/testdata/satellite-config.yaml.lock b/scripts/testdata/satellite-config.yaml.lock
@@ -76,6 +76,12 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0
 # secret used to sign auth tokens
 # console.auth-token-secret: ""
 
+# url link for for beta satellite feedback
+# console.beta-satellite-feedback-url: ""
+
+# url link for for beta satellite support
+# console.beta-satellite-support-url: ""
+
 # url link to contacts page
 # console.contact-info-url: https://forum.storj.io
 

diff --git a/web/satellite/index.html b/web/satellite/index.html
@@ -16,6 +16,8 @@
     <meta name="project-limits-increase-request-url" content="{{ .ProjectLimitsIncreaseRequestURL }}">
     <meta name="gateway-credentials-request-url" content="{{ .GatewayCredentialsRequestURL }}">
     <meta name="is-beta-satellite" content="{{ .IsBetaSatellite }}">
+    <meta name="beta-satellite-feedback-url" content="{{ .BetaSatelliteFeedbackURL }}">
+    <meta name="beta-satellite-support-url" content="{{ .BetaSatelliteSupportURL }}">
     <title>{{ .SatelliteName }}</title>
     <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAL8SURBVHgBxVcxTFNRFL01JvylrRsmNWETWWSybg5I3NTQBCdRFyfrDuoKMgMyOQgdTcDAJmrUrWWCgQIbhJKy0TJQpsc73P/S9/tfP+8/GnqSn1fo77/3nnPufe8nhAR1ETeoy7hJjpj93/ycu0+UuUVuEA5Y2xaifirEVpX/nvknnBFbgpMGUfmIKOkRLRT578oxXy6IJcFCialH0EyaaPoZBy7tEQ3NEY1IKd4/iidHwqYLijLA559cuY6dT0RjBU5AAYm9fiivLFnBKMGBTyeqQ4BXhXDwdqjUiKZkskOzREsbzeeBNRMCEiDgr12uYl1WNbnW/oc2iUys8jrQyyxhHRkM3hdgAMFBHQyGG/GDqyDlsSeS/npQC99jlEBpOnyX2XCF8sGhZLbeMLMZkCDbJ1nYYTfDeMP9fMH5y5vmIKYE8RxUjBXPedDH1Zu6I9QFSzLQxErz4Xn5oNwg+2NSmuv3Lkvz4QlTi8rupDlBmA6tqQLrnYNCvoxSNAOtUEaakwzMv+ALidTP2OlKKiSK75Cs6hy9NYFkjzmG1SBCIuUq0Za8pgydge8R9E+e10qNrGE1ikH5435mo11bQgr4B9LEgVUC0Npm1o+vcuvBxB1NYFsaaeC2XUuW/Xs7msC9Xqa+MMa9jQr1KtXAQoKYHakeskbIhDrVasdTbbVY4s8ZYld/9PWuyeTSHksFBjBFcZ+aH/j/yZk5gcAcgImgIX6MNsKKhKBta1sB2A3HV5pD6iJQIzw/MICwoohc1F6ALBH03XemFYPl+VdzcBNUh6j5gZZEcP341opAAnX/AXl/A0FlrrshgMRR+YUvPPN8CHgAxlqWVYuEdH7V/ZilA6cosFDa53EcmUDKC+7X+IwxHEVhO0DK6aeXH88uHcWQA8xE7Yg69M6xgdWZUEFtNNDyx1s2KnyDIxu22zdZTjgWhANm/vL6clGIsnw3+Fbk94RreS8AMGrBxvwoT0lMPnSNC2JJoAPdgnMBJLjKq5lzAp1C19+OzwFiYzAU5f7eeQAAAABJRU5ErkJggg==" type="image/x-icon">
     <link rel="dns-prefetch" href="https://js.stripe.com">

diff --git a/web/satellite/src/views/DashboardArea.vue b/web/satellite/src/views/DashboardArea.vue
@@ -8,7 +8,10 @@
         </div>
         <div v-if="isBetaSatellite" class="dashboard__beta-banner">
             <p class="dashboard__beta-banner__message">
-                Please be aware that this is a beta satellite. Data uploaded may be deleted at any point in time.
+                Thanks for testing the {{satelliteName}} Beta satellite | Data may be deleted during this beta | Submit testing feedback
+                <a class="dashboard__beta-banner__message__link" :href="betaFeedbackURL" target="_blank" rel="noopener noreferrer">here</a>
+                | Request support
+                <a class="dashboard__beta-banner__message__link" :href="betaSupportURL" target="_blank" rel="noopener noreferrer">here</a>
             </p>
         </div>
         <NoPaywallInfoBar v-if="isNoPaywallInfoBarShown && !isLoading && !isBetaSatellite"/>
@@ -228,6 +231,27 @@ export default class DashboardArea extends Vue {
         await this.$store.dispatch(APP_STATE_ACTIONS.CHANGE_STATE, AppState.LOADED);
     }
 
+    /**
+     * Returns satellite name from store (config).
+     */
+    public get satelliteName(): string {
+        return MetaUtils.getMetaContent('satellite-name');
+    }
+
+    /**
+     * Returns feedback URL from config for beta satellites.
+     */
+    public get betaFeedbackURL(): string {
+        return MetaUtils.getMetaContent('beta-satellite-feedback-url');
+    }
+
+    /**
+     * Returns support URL from config for beta satellites.
+     */
+    public get betaSupportURL(): string {
+        return MetaUtils.getMetaContent('beta-satellite-support-url');
+    }
+
     /**
      * Indicates if no paywall info bar is shown.
      */
@@ -405,8 +429,19 @@ export default class DashboardArea extends Vue {
             &__message {
                 font-weight: normal;
                 font-size: 14px;
-                line-height: 12px;
+                line-height: 16px;
                 color: #fff;
+
+                &__link {
+                    font-size: 14px;
+                    line-height: 16px;
+                    color: #fff;
+                    text-decoration: underline;
+
+                    &:hover {
+                        text-decoration: none;
+                    }
+                }
             }
         }