Commit 6f902c70 authored by Alexander Hendrich's avatar Alexander Hendrich Committed by Commit Bot

Remove unused 'editable' variable for ip config and nameservers

This CL removes the unused |editable| variable in the ip config and
nameserver settings page. It was always set to true and probably left
over from some refactoring in the past.

Bug: 919066
Change-Id: I13a1305b1a2d87f413ced4400b5a337ba37952f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1539660Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Alexander Hendrich <hendrich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644718}
parent 3192c3b0
...@@ -224,8 +224,7 @@ ...@@ -224,8 +224,7 @@
<template is="dom-if" if="[[showCellularSim_(networkProperties_)]]" <template is="dom-if" if="[[showCellularSim_(networkProperties_)]]"
restamp> restamp>
<div class="settings-box single-column stretch"> <div class="settings-box single-column stretch">
<network-siminfo <network-siminfo on-siminfo-change="onNetworkPropertyChange_"
editable on-siminfo-change="onNetworkPropertyChange_"
network-properties="[[networkProperties_]]" network-properties="[[networkProperties_]]"
networking-private="[[networkingPrivate]]"> networking-private="[[networkingPrivate]]">
</network-siminfo> </network-siminfo>
...@@ -309,7 +308,7 @@ ...@@ -309,7 +308,7 @@
<!-- APN --> <!-- APN -->
<template is="dom-if" if="[[isCellular_(networkProperties_)]]"> <template is="dom-if" if="[[isCellular_(networkProperties_)]]">
<network-apnlist editable on-apn-change="onNetworkPropertyChange_" <network-apnlist on-apn-change="onNetworkPropertyChange_"
network-properties="[[networkProperties_]]"> network-properties="[[networkProperties_]]">
</network-apnlist> </network-apnlist>
</template> </template>
...@@ -317,11 +316,10 @@ ...@@ -317,11 +316,10 @@
<!-- IP Config, Nameservers --> <!-- IP Config, Nameservers -->
<template is="dom-if" <template is="dom-if"
if="[[isRememberedOrConnected_(networkProperties_)]]"> if="[[isRememberedOrConnected_(networkProperties_)]]">
<network-ip-config editable on-ip-change="onIPConfigChange_" <network-ip-config on-ip-change="onIPConfigChange_"
network-properties="[[networkProperties_]]"> network-properties="[[networkProperties_]]">
</network-ip-config> </network-ip-config>
<network-nameservers editable <network-nameservers on-nameservers-change="onIPConfigChange_"
on-nameservers-change="onIPConfigChange_"
network-properties="[[networkProperties_]]"> network-properties="[[networkProperties_]]">
</network-nameservers> </network-nameservers>
</template> </template>
......
...@@ -23,16 +23,16 @@ ...@@ -23,16 +23,16 @@
networkProperties, 'IPAddressConfigType')]]"> networkProperties, 'IPAddressConfigType')]]">
</cr-policy-indicator> </cr-policy-indicator>
<cr-toggle checked="{{automatic_}}" <cr-toggle checked="{{automatic_}}"
disabled="[[!canChangeIPConfigType_(editable, networkProperties)]]" disabled="[[!canChangeIPConfigType_(networkProperties)]]"
on-change="onAutomaticChange_" on-change="onAutomaticChange_"
aria-labelledby="autoIPConfigLabel"> aria-labelledby="autoIPConfigLabel">
</cr-toggle> </cr-toggle>
</div> </div>
<template is="dom-if" if="[[hasIpConfigFields_(ipConfig_)]]"> <template is="dom-if" if="[[hasIpConfigFields_(ipConfig_)]]">
<div class="property-box single-column indented stretch"> <div class="property-box single-column indented stretch">
<network-property-list editable <network-property-list fields="[[ipConfigFields_]]"
fields="[[ipConfigFields_]]" property-dict="[[ipConfig_]]" property-dict="[[ipConfig_]]"
edit-field-types="[[getIPEditFields_(editable, automatic_)]]" edit-field-types="[[getIPEditFields_(automatic_)]]"
on-property-change="onIPChange_"> on-property-change="onIPChange_">
</network-property-list> </network-property-list>
</div> </div>
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
/** /**
* @fileoverview Polymer element for displaying the IP Config properties for * @fileoverview Polymer element for displaying the IP Config properties for
* a network state. TODO(stevenjb): Allow editing of static IP configurations * a network state.
* when 'editable' is true.
*/ */
Polymer({ Polymer({
is: 'network-ip-config', is: 'network-ip-config',
...@@ -23,14 +22,6 @@ Polymer({ ...@@ -23,14 +22,6 @@ Polymer({
observer: 'networkPropertiesChanged_', observer: 'networkPropertiesChanged_',
}, },
/**
* Whether or not the IP Address can be edited.
*/
editable: {
type: Boolean,
value: false,
},
/** /**
* State of 'Configure IP Addresses Automatically'. * State of 'Configure IP Addresses Automatically'.
* @private * @private
...@@ -112,16 +103,12 @@ Polymer({ ...@@ -112,16 +103,12 @@ Polymer({
/** /**
* Checks whether IP address config type can be changed. * Checks whether IP address config type can be changed.
* @param {boolean} editable
* @param {!CrOnc.NetworkProperties} networkProperties * @param {!CrOnc.NetworkProperties} networkProperties
* @return {boolean} true only if 'IPAddressConfigType' as well as all other * @return {boolean} true only if 'IPAddressConfigType' as well as all other
* IP address config related fields are editable. * IP address config related fields are editable.
* @private * @private
*/ */
canChangeIPConfigType_: function(editable, networkProperties) { canChangeIPConfigType_: function(networkProperties) {
if (!editable) {
return false;
}
const controlledProps = [ const controlledProps = [
'IPAddressConfigType', 'StaticIPConfig.IPAddress', 'IPAddressConfigType', 'StaticIPConfig.IPAddress',
'StaticIPConfig.RoutingPrefix', 'StaticIPConfig.Gateway' 'StaticIPConfig.RoutingPrefix', 'StaticIPConfig.Gateway'
...@@ -226,7 +213,7 @@ Polymer({ ...@@ -226,7 +213,7 @@ Polymer({
* @private * @private
*/ */
getIPEditFields_: function() { getIPEditFields_: function() {
if (!this.editable || this.automatic_) { if (this.automatic_) {
return {}; return {};
} }
return { return {
......
...@@ -103,8 +103,8 @@ ...@@ -103,8 +103,8 @@
<template is="dom-repeat" items="[[nameservers_]]"> <template is="dom-repeat" items="[[nameservers_]]">
<cr-input id="nameserver[[index]]" value="[[item]]" <cr-input id="nameserver[[index]]" value="[[item]]"
on-change="onValueChange_" on-change="onValueChange_"
disabled="[[!canEditCustomNameServers_(editable, disabled="[[!canEditCustomNameServers_(nameserversType_,
nameserversType_, networkProperties)]]"> networkProperties)]]">
</cr-input> </cr-input>
</template> </template>
</div> </div>
......
...@@ -21,12 +21,6 @@ Polymer({ ...@@ -21,12 +21,6 @@ Polymer({
observer: 'networkPropertiesChanged_', observer: 'networkPropertiesChanged_',
}, },
/** Whether or not the nameservers can be edited. */
editable: {
type: Boolean,
value: false,
},
/** /**
* Array of nameserver addresses stored as strings. * Array of nameserver addresses stored as strings.
* @private {!Array<string>} * @private {!Array<string>}
...@@ -59,7 +53,7 @@ Polymer({ ...@@ -59,7 +53,7 @@ Polymer({
/** @private */ /** @private */
canChangeConfigType_: { canChangeConfigType_: {
type: Boolean, type: Boolean,
computed: 'computeCanChangeConfigType_(editable, networkProperties)', computed: 'computeCanChangeConfigType_(networkProperties)',
} }
}, },
...@@ -139,16 +133,11 @@ Polymer({ ...@@ -139,16 +133,11 @@ Polymer({
}, },
/** /**
* @param {boolean} editable
* @param {!CrOnc.NetworkProperties} networkProperties * @param {!CrOnc.NetworkProperties} networkProperties
* @return {boolean} True if the nameservers config type type can be changed. * @return {boolean} True if the nameservers config type type can be changed.
* @private * @private
*/ */
computeCanChangeConfigType_: function(editable, networkProperties) { computeCanChangeConfigType_: function(networkProperties) {
if (!editable) {
return false;
}
return !this.isNetworkPolicyPathEnforced( return !this.isNetworkPolicyPathEnforced(
networkProperties, 'NameServersConfigType') && networkProperties, 'NameServersConfigType') &&
!this.isNetworkPolicyPathEnforced( !this.isNetworkPolicyPathEnforced(
...@@ -156,15 +145,13 @@ Polymer({ ...@@ -156,15 +145,13 @@ Polymer({
}, },
/** /**
* @param {boolean} editable
* @param {string} nameserversType * @param {string} nameserversType
* @param {!CrOnc.NetworkProperties} networkProperties * @param {!CrOnc.NetworkProperties} networkProperties
* @return {boolean} True if the nameservers are editable. * @return {boolean} True if the nameservers are editable.
* @private * @private
*/ */
canEditCustomNameServers_: function( canEditCustomNameServers_: function(nameserversType, networkProperties) {
editable, nameserversType, networkProperties) { return nameserversType == 'custom' &&
return editable && nameserversType == 'custom' &&
!this.isNetworkPolicyEnforced( !this.isNetworkPolicyEnforced(
networkProperties.NameServersConfigType) && networkProperties.NameServersConfigType) &&
!!networkProperties.StaticIPConfig && !!networkProperties.StaticIPConfig &&
......
...@@ -13,16 +13,6 @@ Polymer({ ...@@ -13,16 +13,6 @@ Polymer({
behaviors: [I18nBehavior, CrPolicyNetworkBehavior], behaviors: [I18nBehavior, CrPolicyNetworkBehavior],
properties: { properties: {
/**
* If true, all fields are shown as editable. Fields without an edit type
* or that are policy enforced will be shown as 'readonly'. Used for lists
* with dynamic edit types (e.g. network-ip-config).
*/
editable: {
type: Boolean,
value: false,
},
/** /**
* The dictionary containing the properties to display. * The dictionary containing the properties to display.
* @type {!Object|undefined} * @type {!Object|undefined}
...@@ -182,7 +172,7 @@ Polymer({ ...@@ -182,7 +172,7 @@ Polymer({
* @private * @private
*/ */
showEditable_: function(key, propertyDict, editFieldTypes) { showEditable_: function(key, propertyDict, editFieldTypes) {
return this.isEditable_(key, propertyDict, editFieldTypes) || this.editable; return this.isEditable_(key, propertyDict, editFieldTypes);
}, },
/** /**
......
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