Rename flag to make it clear it's ephemeral.

Jigsaw-Code · Sep 25, 2023 · 1442f32 · 1442f32
1 parent 494a9cf
commit 1442f32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/www/ui_components/app-root.js b/src/www/ui_components/app-root.js
@@ -294,10 +294,10 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
 
         <iron-pages id="pages" selected="[[page]]" attr-for-selected="name">
           <servers-view name="servers" id="serversView" servers="[[servers]]" localize="[[localize]]" use-alt-access-message="[[useAltAccessMessage]]""></servers-view>
-          <template is="dom-if" if="{{enableNewContactView}}">
+          <template is="dom-if" if="{{contactViewFeatureFlag}}">
             <contact-view name="contact" id="contactView"></contact-view>
           </template>
-          <template is="dom-if" if="{{!enableNewContactView}}">
+          <template is="dom-if" if="{{!contactViewFeatureFlag}}">
             <feedback-view name="feedback" id="feedbackView" localize="[[localize]]"></feedback-view>
           </template>
           <about-view
@@ -371,13 +371,13 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
               <img src$="[[rootPath]]assets/icons/outline.png" alt="outline"  />
               <span class="item-label">[[localize('servers-menu-item')]]</span>
             </paper-item>
-            <template is="dom-if" if="{{enableNewContactView}}">
+            <template is="dom-if" if="{{contactViewFeatureFlag}}">
               <paper-item name="contact">
                 <img src$="[[rootPath]]assets/icons/contact.png" alt="contact"  />
                 [[localize('contact-page-title')]]
               </paper-item>
             </template>
-            <template is="dom-if" if="{{!enableNewContactView}}">
+            <template is="dom-if" if="{{!contactViewFeatureFlag}}">
               <paper-item name="feedback">
                 <img src$="[[rootPath]]assets/icons/feedback.png" alt="feedback"  />
                 [[localize('feedback-page-title')]]
@@ -595,7 +595,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         type: Boolean,
         computed: '_computeUseAltAccessMessage(language)',
       },
-      enableNewContactView: {
+      contactViewFeatureFlag: {
         type: Boolean,
         readonly: true,
         value: false,

diff --git a/src/www/views/contact_view/support_form/index.ts b/src/www/views/contact_view/support_form/index.ts
@@ -104,9 +104,7 @@ export class SupportForm extends LitElement {
   }
 
   private get renderCloudProviderInputField(): TemplateResult | typeof nothing {
-    if (this.variant !== AppType.MANAGER) {
-      return nothing;
-    }
+    if (this.variant !== AppType.MANAGER) return nothing;
 
     const providers = Array.from(SupportForm.CLOUD_PROVIDERS);
     /** We should sort the providers by their labels, which may be localized. */
@@ -143,8 +141,9 @@ export class SupportForm extends LitElement {
   }
 
   private get renderAccessKeySourceInputField(): TemplateResult | typeof nothing {
-    return this.variant === AppType.CLIENT
-      ? html`
+    if (this.variant !== AppType.CLIENT) return nothing;
+
+    return html`
           <mwc-textfield
             name="Where_did_you_get_your_access_key"
             label="Source"
@@ -156,8 +155,7 @@ export class SupportForm extends LitElement {
             outlined
             @blur=${this.checkFormValidity}
           ></mwc-textfield>
-        `
-      : nothing;
+        `;
   }
 
   render() {