[CrOS Settings] Remove ButtonState.HIDDEN from button_bar.

Clean up button_bar state by replacing ButtonState.HIDDEN with
undefined.

Bug: 1093185
Change-Id: I24e5562adfc0eb1cc7acd89fe8586e31b5d0371a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2630627
Commit-Queue: Gordon Seto <gordonseto@google.com>
Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843863}

chrome/test/data/webui/cr_components/chromeos/cellular_setup/button_bar_test.js

@@ -64,7 +64,7 @@ suite('CellularSetupButtonBarTest', function() {
   }
 
   test('individual buttons appear if enabled', function() {
-    setStateForAllButtons(cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+    setStateForAllButtons(cellularSetup.ButtonState.ENABLED);
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#backward')));
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#cancel')));
     assertTrue(isButtonShownAndEnabled(buttonBar.$$('#tryAgain')));
@@ -74,7 +74,7 @@ suite('CellularSetupButtonBarTest', function() {
   });
 
   test('individual buttons appear but are diabled', function() {
-    setStateForAllButtons(cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
+    setStateForAllButtons(cellularSetup.ButtonState.DISABLED);
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#backward')));
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#cancel')));
     assertTrue(isButtonShownAndDisabled(buttonBar.$$('#tryAgain')));
@@ -84,7 +84,7 @@ suite('CellularSetupButtonBarTest', function() {
   });
 
   test('individual buttons are hidden', function() {
-    setStateForAllButtons(cellularSetup.ButtonState.HIDDEN);
+    setStateForAllButtons(undefined);
     assertTrue(isButtonHidden(buttonBar.$$('#backward')));
     assertTrue(isButtonHidden(buttonBar.$$('#cancel')));
     assertTrue(isButtonHidden(buttonBar.$$('#tryAgain')));

chrome/test/data/webui/cr_components/chromeos/cellular_setup/esim_flow_ui_test.js

@@ -66,8 +66,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
 
     // Forward button should now be enabled.
     assertTrue(
-        eSimPage.buttonState.forward ===
-        cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+        eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
 
     eSimPage.navigateForward();
     return confirmationCodeInput;
@@ -96,8 +95,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
 
       // Forward button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.forward ===
-          cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+          eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
     });
 
     test('Invalid activation code', async function() {
@@ -285,7 +283,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
       // Simulate pressing 'Skip'.
       assertTrue(
           eSimPage.buttonState.skipDiscovery ===
-          cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+          cellularSetup.ButtonState.ENABLED);
       eSimPage.navigateForward();
       Polymer.dom.flush();
 
@@ -298,8 +296,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
 
       // Simulate pressing 'Forward'.
       assertTrue(
-          eSimPage.buttonState.forward ===
-          cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+          eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
       eSimPage.navigateForward();
       await flushAsync();
 
@@ -315,11 +312,8 @@ suite('CrComponentsEsimFlowUiTest', function() {
 
       // The 'Forward' button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.forward ===
-          cellularSetup.ButtonState.SHOWN_AND_ENABLED);
-      assertTrue(
-          eSimPage.buttonState.skipDiscovery ===
-          cellularSetup.ButtonState.HIDDEN);
+          eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
+      assertFalse(!!eSimPage.buttonState.skipDiscovery);
 
       // Simulate pressing 'Forward'.
       eSimPage.navigateForward();
@@ -344,11 +338,8 @@ suite('CrComponentsEsimFlowUiTest', function() {
 
       // The 'Forward' button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.forward ===
-          cellularSetup.ButtonState.SHOWN_AND_ENABLED);
-      assertTrue(
-          eSimPage.buttonState.skipDiscovery ===
-          cellularSetup.ButtonState.HIDDEN);
+          eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
+      assertFalse(!!eSimPage.buttonState.skipDiscovery);
 
       // Simulate pressing 'Forward'.
       eSimPage.navigateForward();
@@ -364,8 +355,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
 
       // Forward button should now be enabled.
       assertTrue(
-          eSimPage.buttonState.forward ===
-          cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+          eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
 
       eSimPage.navigateForward();
 

ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.js

@@ -32,8 +32,7 @@ Polymer({
    * @private
    */
   isButtonHidden_(buttonName) {
-    const state = this.getButtonBarState_(buttonName);
-    return state === cellularSetup.ButtonState.HIDDEN;
+    return !this.getButtonBarState_(buttonName);
   },
 
   /**
@@ -43,7 +42,7 @@ Polymer({
    */
   isButtonDisabled_(buttonName) {
     const state = this.getButtonBarState_(buttonName);
-    return state === cellularSetup.ButtonState.SHOWN_BUT_DISABLED;
+    return state === cellularSetup.ButtonState.DISABLED;
   },
 
   /** @private */
@@ -93,7 +92,7 @@ Polymer({
         return this.buttonState.skipDiscovery;
       default:
         assertNotReached();
-        return cellularSetup.ButtonState.SHOWN_AND_ENABLED;
+        return cellularSetup.ButtonState.ENABLED;
     }
   }
 });

ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_types.js

@@ -15,9 +15,8 @@ cr.define('cellularSetup', function() {
 
   /** @enum {number} */
   /* #export */ const ButtonState = {
-    HIDDEN: 1,
-    SHOWN_AND_ENABLED: 2,
-    SHOWN_BUT_DISABLED: 3,
+    ENABLED: 1,
+    DISABLED: 2,
   };
 
   /** @enum {number} */

ui/webui/resources/cr_components/chromeos/cellular_setup/esim_flow_ui.js

@@ -231,49 +231,34 @@ cr.define('cellular_setup', function() {
         case ESimUiState.PROFILE_SEARCH:
         case ESimUiState.ACTIVATION_CODE_ENTRY:
           buttonState = {
-            backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
+            backward: cellularSetup.ButtonState.ENABLED,
             cancel: this.delegate.shouldShowCancelButton() ?
-                cellularSetup.ButtonState.SHOWN_AND_ENABLED :
-                cellularSetup.ButtonState.HIDDEN,
-            done: cellularSetup.ButtonState.HIDDEN,
-            forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
-            tryAgain: cellularSetup.ButtonState.HIDDEN,
-            skipDiscovery: cellularSetup.ButtonState.HIDDEN,
+                cellularSetup.ButtonState.ENABLED :
+                undefined,
+            forward: cellularSetup.ButtonState.DISABLED,
           };
           break;
         case ESimUiState.CONFIRMATION_CODE_ENTRY:
           buttonState = {
-            backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
+            backward: cellularSetup.ButtonState.ENABLED,
             cancel: this.delegate.shouldShowCancelButton() ?
-                cellularSetup.ButtonState.SHOWN_AND_ENABLED :
-                cellularSetup.ButtonState.HIDDEN,
-            done: cellularSetup.ButtonState.HIDDEN,
+                cellularSetup.ButtonState.ENABLED :
+                undefined,
             // TODO(crbug.com/1093185) Add a "Confirm" button state.
-            forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
-            tryAgain: cellularSetup.ButtonState.HIDDEN,
-            skipDiscovery: cellularSetup.ButtonState.HIDDEN,
+            forward: cellularSetup.ButtonState.DISABLED,
           };
           break;
         case ESimUiState.PROFILE_SELECTION:
           buttonState = {
-            backward: cellularSetup.ButtonState.HIDDEN,
             cancel: this.delegate.shouldShowCancelButton() ?
-                cellularSetup.ButtonState.SHOWN_AND_ENABLED :
-                cellularSetup.ButtonState.HIDDEN,
-            done: cellularSetup.ButtonState.HIDDEN,
-            forward: cellularSetup.ButtonState.HIDDEN,
-            tryAgain: cellularSetup.ButtonState.HIDDEN,
-            skipDiscovery: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
+                cellularSetup.ButtonState.ENABLED :
+                undefined,
+            skipDiscovery: cellularSetup.ButtonState.ENABLED,
           };
           break;
         case ESimUiState.SETUP_FINISH:
           buttonState = {
-            backward: cellularSetup.ButtonState.HIDDEN,
-            cancel: cellularSetup.ButtonState.HIDDEN,
-            done: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            forward: cellularSetup.ButtonState.HIDDEN,
-            tryAgain: cellularSetup.ButtonState.HIDDEN,
-            skipDiscovery: cellularSetup.ButtonState.HIDDEN,
+            done: cellularSetup.ButtonState.ENABLED,
           };
           break;
         default:
@@ -286,26 +271,21 @@ cr.define('cellular_setup', function() {
     /** @private */
     onActivationCodeUpdated_(event) {
       if (event.detail.activationCode) {
-        this.set(
-            'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+        this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
       } else {
-        this.set(
-            'buttonState.forward',
-            cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
+        this.set('buttonState.forward', cellularSetup.ButtonState.DISABLED);
       }
     },
 
     /** @private */
     onSelectedProfileChanged_() {
       if (this.selectedProfile_) {
-        this.set('buttonState.skipDiscovery', cellularSetup.ButtonState.HIDDEN);
-        this.set(
-            'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+        this.set('buttonState.skipDiscovery', undefined);
+        this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
       } else {
+        this.set('buttonState.forward', undefined);
         this.set(
-            'buttonState.skipDiscovery',
-            cellularSetup.ButtonState.SHOWN_AND_ENABLED);
-        this.set('buttonState.forward', cellularSetup.ButtonState.HIDDEN);
+            'buttonState.skipDiscovery', cellularSetup.ButtonState.ENABLED);
       }
     },
 
@@ -314,12 +294,9 @@ cr.define('cellular_setup', function() {
       // TODO(crbug.com/1093185) Change this to updating a "Confirm" button's
       // state.
       if (this.confirmationCode_) {
-        this.set(
-            'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+        this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
       } else {
-        this.set(
-            'buttonState.forward',
-            cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
+        this.set('buttonState.forward', cellularSetup.ButtonState.DISABLED);
       }
     },
 

ui/webui/resources/cr_components/chromeos/cellular_setup/psim_flow_ui.js

@@ -207,35 +207,24 @@ cr.define('cellularSetup', function() {
         case PSimUIState.TIMEOUT_PORTAL_LOAD:
         case PSimUIState.WAITING_FOR_USER_PAYMENT:
           buttonState = {
-            backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            done: cellularSetup.ButtonState.HIDDEN,
-            forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
-            tryAgain: cellularSetup.ButtonState.HIDDEN,
-            skipDiscovery: cellularSetup.ButtonState.HIDDEN,
+            backward: cellularSetup.ButtonState.ENABLED,
+            cancel: cellularSetup.ButtonState.ENABLED,
+            forward: cellularSetup.ButtonState.DISABLED,
           };
           break;
         case PSimUIState.ACTIVATION_SUCCESS:
         case PSimUIState.ALREADY_ACTIVATED:
         case PSimUIState.ACTIVATION_FAILURE:
           buttonState = {
-            backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            done: cellularSetup.ButtonState.HIDDEN,
-            forward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            tryAgain: cellularSetup.ButtonState.HIDDEN,
-            skipDiscovery: cellularSetup.ButtonState.HIDDEN,
+            backward: cellularSetup.ButtonState.ENABLED,
+            cancel: cellularSetup.ButtonState.ENABLED,
+            forward: cellularSetup.ButtonState.ENABLED,
           };
           break;
         case PSimUIState.WAITING_FOR_ACTIVATION_TO_FINISH:
         case PSimUIState.TIMEOUT_FINISH_ACTIVATION:
           buttonState = {
-            backward: cellularSetup.ButtonState.HIDDEN,
-            cancel: cellularSetup.ButtonState.HIDDEN,
-            done: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-            forward: cellularSetup.ButtonState.HIDDEN,
-            tryAgain: cellularSetup.ButtonState.HIDDEN,
-            skipDiscovery: cellularSetup.ButtonState.HIDDEN,
+            done: cellularSetup.ButtonState.ENABLED,
           };
           break;
         default:

ui/webui/resources/cr_components/chromeos/cellular_setup/setup_selection_flow.js

@@ -44,19 +44,13 @@ Polymer({
    */
   updateButtonState_(selectedPage) {
     this.buttonState = {
-      backward: cellularSetup.ButtonState.HIDDEN,
-      cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
-      done: cellularSetup.ButtonState.HIDDEN,
-      tryAgain: cellularSetup.ButtonState.HIDDEN,
-      skipDiscovery: cellularSetup.ButtonState.HIDDEN,
+      cancel: cellularSetup.ButtonState.ENABLED,
     };
     if (selectedPage === cellularSetup.CellularSetupPageName.PSIM_FLOW_UI ||
         selectedPage === cellularSetup.CellularSetupPageName.ESIM_FLOW_UI) {
-      this.set(
-          'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
+      this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
     } else {
-      this.set(
-          'buttonState.forward', cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
+      this.set('buttonState.forward', cellularSetup.ButtonState.DISABLED);
     }
   }
 });
\ No newline at end of file