Skip to content

GitLab

T
tangled
Commit 8a8e7f6a authored by Gordon Seto's avatar Gordon Seto Committed by Chromium LUCI CQ
Browse files
Options

[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: default avatarAzeem Arshad <azeemarshad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843863}
parent c9691a64
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 99 deletions
chrome/test/data/webui/cr_components/chromeos/cellular_setup/button_bar_test.js
View file @ 8a8e7f6a
...@@ -64,7 +64,7 @@ suite('CellularSetupButtonBarTest', function() { ...@@ -64,7 +64,7 @@ suite('CellularSetupButtonBarTest', function() {
} }
test('individual buttons appear if enabled', 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.$$('#backward')));
assertTrue(isButtonShownAndEnabled(buttonBar.$$('#cancel'))); assertTrue(isButtonShownAndEnabled(buttonBar.$$('#cancel')));
assertTrue(isButtonShownAndEnabled(buttonBar.$$('#tryAgain'))); assertTrue(isButtonShownAndEnabled(buttonBar.$$('#tryAgain')));
...@@ -74,7 +74,7 @@ suite('CellularSetupButtonBarTest', function() { ...@@ -74,7 +74,7 @@ suite('CellularSetupButtonBarTest', function() {
}); });
test('individual buttons appear but are diabled', 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.$$('#backward')));
assertTrue(isButtonShownAndDisabled(buttonBar.$$('#cancel'))); assertTrue(isButtonShownAndDisabled(buttonBar.$$('#cancel')));
assertTrue(isButtonShownAndDisabled(buttonBar.$$('#tryAgain'))); assertTrue(isButtonShownAndDisabled(buttonBar.$$('#tryAgain')));
...@@ -84,7 +84,7 @@ suite('CellularSetupButtonBarTest', function() { ...@@ -84,7 +84,7 @@ suite('CellularSetupButtonBarTest', function() {
}); });
test('individual buttons are hidden', function() { test('individual buttons are hidden', function() {
setStateForAllButtons(cellularSetup.ButtonState.HIDDEN); setStateForAllButtons(undefined);
assertTrue(isButtonHidden(buttonBar.$$('#backward'))); assertTrue(isButtonHidden(buttonBar.$$('#backward')));
assertTrue(isButtonHidden(buttonBar.$$('#cancel'))); assertTrue(isButtonHidden(buttonBar.$$('#cancel')));
assertTrue(isButtonHidden(buttonBar.$$('#tryAgain'))); assertTrue(isButtonHidden(buttonBar.$$('#tryAgain')));
......
chrome/test/data/webui/cr_components/chromeos/cellular_setup/esim_flow_ui_test.js
View file @ 8a8e7f6a
...@@ -66,8 +66,7 @@ suite('CrComponentsEsimFlowUiTest', function() { ...@@ -66,8 +66,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Forward button should now be enabled. // Forward button should now be enabled.
assertTrue( assertTrue(
eSimPage.buttonState.forward === eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
cellularSetup.ButtonState.SHOWN_AND_ENABLED);
eSimPage.navigateForward(); eSimPage.navigateForward();
return confirmationCodeInput; return confirmationCodeInput;
...@@ -96,8 +95,7 @@ suite('CrComponentsEsimFlowUiTest', function() { ...@@ -96,8 +95,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Forward button should now be enabled. // Forward button should now be enabled.
assertTrue( assertTrue(
eSimPage.buttonState.forward === eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
cellularSetup.ButtonState.SHOWN_AND_ENABLED);
}); });
test('Invalid activation code', async function() { test('Invalid activation code', async function() {
...@@ -285,7 +283,7 @@ suite('CrComponentsEsimFlowUiTest', function() { ...@@ -285,7 +283,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Simulate pressing 'Skip'. // Simulate pressing 'Skip'.
assertTrue( assertTrue(
eSimPage.buttonState.skipDiscovery === eSimPage.buttonState.skipDiscovery ===
cellularSetup.ButtonState.SHOWN_AND_ENABLED); cellularSetup.ButtonState.ENABLED);
eSimPage.navigateForward(); eSimPage.navigateForward();
Polymer.dom.flush(); Polymer.dom.flush();
...@@ -298,8 +296,7 @@ suite('CrComponentsEsimFlowUiTest', function() { ...@@ -298,8 +296,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Simulate pressing 'Forward'. // Simulate pressing 'Forward'.
assertTrue( assertTrue(
eSimPage.buttonState.forward === eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
cellularSetup.ButtonState.SHOWN_AND_ENABLED);
eSimPage.navigateForward(); eSimPage.navigateForward();
await flushAsync(); await flushAsync();
...@@ -315,11 +312,8 @@ suite('CrComponentsEsimFlowUiTest', function() { ...@@ -315,11 +312,8 @@ suite('CrComponentsEsimFlowUiTest', function() {
// The 'Forward' button should now be enabled. // The 'Forward' button should now be enabled.
assertTrue( assertTrue(
eSimPage.buttonState.forward === eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
cellularSetup.ButtonState.SHOWN_AND_ENABLED); assertFalse(!!eSimPage.buttonState.skipDiscovery);
assertTrue(
eSimPage.buttonState.skipDiscovery ===
cellularSetup.ButtonState.HIDDEN);
// Simulate pressing 'Forward'. // Simulate pressing 'Forward'.
eSimPage.navigateForward(); eSimPage.navigateForward();
...@@ -344,11 +338,8 @@ suite('CrComponentsEsimFlowUiTest', function() { ...@@ -344,11 +338,8 @@ suite('CrComponentsEsimFlowUiTest', function() {
// The 'Forward' button should now be enabled. // The 'Forward' button should now be enabled.
assertTrue( assertTrue(
eSimPage.buttonState.forward === eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
cellularSetup.ButtonState.SHOWN_AND_ENABLED); assertFalse(!!eSimPage.buttonState.skipDiscovery);
assertTrue(
eSimPage.buttonState.skipDiscovery ===
cellularSetup.ButtonState.HIDDEN);
// Simulate pressing 'Forward'. // Simulate pressing 'Forward'.
eSimPage.navigateForward(); eSimPage.navigateForward();
...@@ -364,8 +355,7 @@ suite('CrComponentsEsimFlowUiTest', function() { ...@@ -364,8 +355,7 @@ suite('CrComponentsEsimFlowUiTest', function() {
// Forward button should now be enabled. // Forward button should now be enabled.
assertTrue( assertTrue(
eSimPage.buttonState.forward === eSimPage.buttonState.forward === cellularSetup.ButtonState.ENABLED);
cellularSetup.ButtonState.SHOWN_AND_ENABLED);
eSimPage.navigateForward(); eSimPage.navigateForward();
......
ui/webui/resources/cr_components/chromeos/cellular_setup/button_bar.js
View file @ 8a8e7f6a
...@@ -32,8 +32,7 @@ Polymer({ ...@@ -32,8 +32,7 @@ Polymer({
* @private * @private
*/ */
isButtonHidden_(buttonName) { isButtonHidden_(buttonName) {
const state = this.getButtonBarState_(buttonName); return !this.getButtonBarState_(buttonName);
return state === cellularSetup.ButtonState.HIDDEN;
}, },
/** /**
...@@ -43,7 +42,7 @@ Polymer({ ...@@ -43,7 +42,7 @@ Polymer({
*/ */
isButtonDisabled_(buttonName) { isButtonDisabled_(buttonName) {
const state = this.getButtonBarState_(buttonName); const state = this.getButtonBarState_(buttonName);
return state === cellularSetup.ButtonState.SHOWN_BUT_DISABLED; return state === cellularSetup.ButtonState.DISABLED;
}, },
/** @private */ /** @private */
...@@ -93,7 +92,7 @@ Polymer({ ...@@ -93,7 +92,7 @@ Polymer({
return this.buttonState.skipDiscovery; return this.buttonState.skipDiscovery;
default: default:
assertNotReached(); assertNotReached();
return cellularSetup.ButtonState.SHOWN_AND_ENABLED; return cellularSetup.ButtonState.ENABLED;
} }
} }
}); });
ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_types.js
View file @ 8a8e7f6a
...@@ -15,9 +15,8 @@ cr.define('cellularSetup', function() { ...@@ -15,9 +15,8 @@ cr.define('cellularSetup', function() {
/** @enum {number} */ /** @enum {number} */
/* #export */ const ButtonState = { /* #export */ const ButtonState = {
HIDDEN: 1, ENABLED: 1,
SHOWN_AND_ENABLED: 2, DISABLED: 2,
SHOWN_BUT_DISABLED: 3,
}; };
/** @enum {number} */ /** @enum {number} */
......
ui/webui/resources/cr_components/chromeos/cellular_setup/esim_flow_ui.js
View file @ 8a8e7f6a
...@@ -231,49 +231,34 @@ cr.define('cellular_setup', function() { ...@@ -231,49 +231,34 @@ cr.define('cellular_setup', function() {
case ESimUiState.PROFILE_SEARCH: case ESimUiState.PROFILE_SEARCH:
case ESimUiState.ACTIVATION_CODE_ENTRY: case ESimUiState.ACTIVATION_CODE_ENTRY:
buttonState = { buttonState = {
backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED, backward: cellularSetup.ButtonState.ENABLED,
cancel: this.delegate.shouldShowCancelButton() ? cancel: this.delegate.shouldShowCancelButton() ?
cellularSetup.ButtonState.SHOWN_AND_ENABLED : cellularSetup.ButtonState.ENABLED :
cellularSetup.ButtonState.HIDDEN, undefined,
done: cellularSetup.ButtonState.HIDDEN, forward: cellularSetup.ButtonState.DISABLED,
forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.HIDDEN,
}; };
break; break;
case ESimUiState.CONFIRMATION_CODE_ENTRY: case ESimUiState.CONFIRMATION_CODE_ENTRY:
buttonState = { buttonState = {
backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED, backward: cellularSetup.ButtonState.ENABLED,
cancel: this.delegate.shouldShowCancelButton() ? cancel: this.delegate.shouldShowCancelButton() ?
cellularSetup.ButtonState.SHOWN_AND_ENABLED : cellularSetup.ButtonState.ENABLED :
cellularSetup.ButtonState.HIDDEN, undefined,
done: cellularSetup.ButtonState.HIDDEN,
// TODO(crbug.com/1093185) Add a "Confirm" button state. // TODO(crbug.com/1093185) Add a "Confirm" button state.
forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED, forward: cellularSetup.ButtonState.DISABLED,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.HIDDEN,
}; };
break; break;
case ESimUiState.PROFILE_SELECTION: case ESimUiState.PROFILE_SELECTION:
buttonState = { buttonState = {
backward: cellularSetup.ButtonState.HIDDEN,
cancel: this.delegate.shouldShowCancelButton() ? cancel: this.delegate.shouldShowCancelButton() ?
cellularSetup.ButtonState.SHOWN_AND_ENABLED : cellularSetup.ButtonState.ENABLED :
cellularSetup.ButtonState.HIDDEN, undefined,
done: cellularSetup.ButtonState.HIDDEN, skipDiscovery: cellularSetup.ButtonState.ENABLED,
forward: cellularSetup.ButtonState.HIDDEN,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
}; };
break; break;
case ESimUiState.SETUP_FINISH: case ESimUiState.SETUP_FINISH:
buttonState = { buttonState = {
backward: cellularSetup.ButtonState.HIDDEN, done: cellularSetup.ButtonState.ENABLED,
cancel: cellularSetup.ButtonState.HIDDEN,
done: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
forward: cellularSetup.ButtonState.HIDDEN,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.HIDDEN,
}; };
break; break;
default: default:
...@@ -286,26 +271,21 @@ cr.define('cellular_setup', function() { ...@@ -286,26 +271,21 @@ cr.define('cellular_setup', function() {
/** @private */ /** @private */
onActivationCodeUpdated_(event) { onActivationCodeUpdated_(event) {
if (event.detail.activationCode) { if (event.detail.activationCode) {
this.set( this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
} else { } else {
this.set( this.set('buttonState.forward', cellularSetup.ButtonState.DISABLED);
'buttonState.forward',
cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
} }
}, },
/** @private */ /** @private */
onSelectedProfileChanged_() { onSelectedProfileChanged_() {
if (this.selectedProfile_) { if (this.selectedProfile_) {
this.set('buttonState.skipDiscovery', cellularSetup.ButtonState.HIDDEN); this.set('buttonState.skipDiscovery', undefined);
this.set( this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
} else { } else {
this.set('buttonState.forward', undefined);
this.set( this.set(
'buttonState.skipDiscovery', 'buttonState.skipDiscovery', cellularSetup.ButtonState.ENABLED);
cellularSetup.ButtonState.SHOWN_AND_ENABLED);
this.set('buttonState.forward', cellularSetup.ButtonState.HIDDEN);
} }
}, },
...@@ -314,12 +294,9 @@ cr.define('cellular_setup', function() { ...@@ -314,12 +294,9 @@ cr.define('cellular_setup', function() {
// TODO(crbug.com/1093185) Change this to updating a "Confirm" button's // TODO(crbug.com/1093185) Change this to updating a "Confirm" button's
// state. // state.
if (this.confirmationCode_) { if (this.confirmationCode_) {
this.set( this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
} else { } else {
this.set( this.set('buttonState.forward', cellularSetup.ButtonState.DISABLED);
'buttonState.forward',
cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
} }
}, },
......
ui/webui/resources/cr_components/chromeos/cellular_setup/psim_flow_ui.js
View file @ 8a8e7f6a
...@@ -207,35 +207,24 @@ cr.define('cellularSetup', function() { ...@@ -207,35 +207,24 @@ cr.define('cellularSetup', function() {
case PSimUIState.TIMEOUT_PORTAL_LOAD: case PSimUIState.TIMEOUT_PORTAL_LOAD:
case PSimUIState.WAITING_FOR_USER_PAYMENT: case PSimUIState.WAITING_FOR_USER_PAYMENT:
buttonState = { buttonState = {
backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED, backward: cellularSetup.ButtonState.ENABLED,
cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED, cancel: cellularSetup.ButtonState.ENABLED,
done: cellularSetup.ButtonState.HIDDEN, forward: cellularSetup.ButtonState.DISABLED,
forward: cellularSetup.ButtonState.SHOWN_BUT_DISABLED,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.HIDDEN,
}; };
break; break;
case PSimUIState.ACTIVATION_SUCCESS: case PSimUIState.ACTIVATION_SUCCESS:
case PSimUIState.ALREADY_ACTIVATED: case PSimUIState.ALREADY_ACTIVATED:
case PSimUIState.ACTIVATION_FAILURE: case PSimUIState.ACTIVATION_FAILURE:
buttonState = { buttonState = {
backward: cellularSetup.ButtonState.SHOWN_AND_ENABLED, backward: cellularSetup.ButtonState.ENABLED,
cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED, cancel: cellularSetup.ButtonState.ENABLED,
done: cellularSetup.ButtonState.HIDDEN, forward: cellularSetup.ButtonState.ENABLED,
forward: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.HIDDEN,
}; };
break; break;
case PSimUIState.WAITING_FOR_ACTIVATION_TO_FINISH: case PSimUIState.WAITING_FOR_ACTIVATION_TO_FINISH:
case PSimUIState.TIMEOUT_FINISH_ACTIVATION: case PSimUIState.TIMEOUT_FINISH_ACTIVATION:
buttonState = { buttonState = {
backward: cellularSetup.ButtonState.HIDDEN, done: cellularSetup.ButtonState.ENABLED,
cancel: cellularSetup.ButtonState.HIDDEN,
done: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
forward: cellularSetup.ButtonState.HIDDEN,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.HIDDEN,
}; };
break; break;
default: default:
......
ui/webui/resources/cr_components/chromeos/cellular_setup/setup_selection_flow.js
View file @ 8a8e7f6a
...@@ -44,19 +44,13 @@ Polymer({ ...@@ -44,19 +44,13 @@ Polymer({
*/ */
updateButtonState_(selectedPage) { updateButtonState_(selectedPage) {
this.buttonState = { this.buttonState = {
backward: cellularSetup.ButtonState.HIDDEN, cancel: cellularSetup.ButtonState.ENABLED,
cancel: cellularSetup.ButtonState.SHOWN_AND_ENABLED,
done: cellularSetup.ButtonState.HIDDEN,
tryAgain: cellularSetup.ButtonState.HIDDEN,
skipDiscovery: cellularSetup.ButtonState.HIDDEN,
}; };
if (selectedPage === cellularSetup.CellularSetupPageName.PSIM_FLOW_UI || if (selectedPage === cellularSetup.CellularSetupPageName.PSIM_FLOW_UI ||
selectedPage === cellularSetup.CellularSetupPageName.ESIM_FLOW_UI) { selectedPage === cellularSetup.CellularSetupPageName.ESIM_FLOW_UI) {
this.set( this.set('buttonState.forward', cellularSetup.ButtonState.ENABLED);
'buttonState.forward', cellularSetup.ButtonState.SHOWN_AND_ENABLED);
} else { } else {
this.set( this.set('buttonState.forward', cellularSetup.ButtonState.DISABLED);
'buttonState.forward', cellularSetup.ButtonState.SHOWN_BUT_DISABLED);
} }
} }
}); });
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment