Skip to content

Commit

Permalink
RPCConfigView refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
BSolonenko authored and BSolonenko committed Nov 9, 2018
1 parent d1f9ba4 commit 0737ce6
Show file tree
Hide file tree
Showing 8 changed files with 215 additions and 311 deletions.
15 changes: 1 addition & 14 deletions app/view/settings/RPCControls/RPCControlConfigView.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SDL.RPCControlConfigView = Em.ContainerView.create(
'SDL.States.settings.rpccontrol.rpcconfig.active:active_state:inactive_state'
],
childViews: [
'backButton',
SDL.RPCViewHelper.getBackButton(),
'rpcList',
'resultCodeTracker',
'saveButton',
Expand Down Expand Up @@ -69,19 +69,6 @@ SDL.RPCControlConfigView = Em.ContainerView.create(
onDown: false
}
),
backButton: SDL.Button.extend(
{
classNames: [
'backControl'
],
action: 'onState',
target: 'SDL.SettingsController',
goToState: 'rpccontrol',
icon: 'images/media/ico_back.png',
style: 'top: 100px',
onDown: false
}
),
rpcList: Em.ContainerView.extend(
{
elementId: 'rpcList',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,97 +32,8 @@ SDL.RPCInteriorVehicleDataControlConfigView = Em.ContainerView.create(
'SDL.States.settings.rpccontrol.rpcinteriorvehicledataconfig.active:active_state:inactive_state'
],
childViews: [
'backButton',
'newButton',
'removeButton',
'previousButton',
'nextButton',
'counterLabel',
'interiorVehicleDataSelect'
],
backButton: SDL.Button.extend(
{
classNames: [
'backControl'
],
action: 'onState',
target: 'SDL.SettingsController',
goToState: 'rpccontrol',
icon: 'images/media/ico_back.png',
style: 'top: 100px',
onDown: false
}),
newButton: SDL.Button.extend(
{
classNames: [
'newButton'
],
action: 'newGetInteriorVehicleData',
target: 'FFW.RPCHelper',
text: 'New',
onDown: false
}),
removeButton: SDL.Button.extend(
{
classNames: [
'removeButton'
],
isDisabled: function() {
return FFW.RPCHelper.GetInteriorVehicleDataResultCodes.length == 1;
}.property(
'FFW.RPCHelper.GetInteriorVehicleDataIndex'

),
disabledBinding: 'isDisabled',
action: 'removeGetInteriorVehicleData',
target: 'FFW.RPCHelper',
text: 'Remove',
onDown: false
}),
previousButton: SDL.Button.extend(
{
classNames: [
'previousButton'
],
isDisabled: function() {
return FFW.RPCHelper.GetInteriorVehicleDataIndex == 0;
}.property(
'FFW.RPCHelper.GetInteriorVehicleDataIndex'
),
disabledBinding: 'isDisabled',
action: 'previousGetInteriorVehicleData',
target: 'FFW.RPCHelper',
text: 'Previous',
onDown: false
}),
nextButton: SDL.Button.extend(
{
classNames: [
'nextButton'
],
isDisabled: function() {
return FFW.RPCHelper.GetInteriorVehicleDataIndex ==
FFW.RPCHelper.GetInteriorVehicleDataResultCodes.length - 1;
}.property(
'FFW.RPCHelper.GetInteriorVehicleDataIndex'
),
disabledBinding: 'isDisabled',
action: 'nextGetInteriorVehicleData',
target: 'FFW.RPCHelper',
text: 'Next',
onDown: false
}),
counterLabel: SDL.Label.extend(
{
elementId: 'counterLabel',
classNames: 'counterLabel',
contentBinding: 'FFW.RPCHelper.GetInteriorVehicleDataResponseStatus'
}),
interiorVehicleDataSelect: Em.Select.extend(
{
elementId: 'interiorVehicleDataSelect',
classNames: 'interiorVehicleDataSelect',
contentBinding: 'SDL.SDLModel.data.resultCodes',
valueBinding: 'FFW.RPCHelper.GetInteriorVehicleData'
}),
SDL.RPCViewHelper.getBackButton(),
SDL.RPCViewHelper.getQueueControls('GetInteriorVehicleData'),
SDL.RPCViewHelper.getSingleSelect('GetInteriorVehicleData')
]
});
88 changes: 3 additions & 85 deletions app/view/settings/RPCControls/RPCVehicleDataControlConfigView.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,93 +32,11 @@ SDL.RPCVehicleDataControlConfigView = Em.ContainerView.create({
],

childViews: [
'backButton',
'newButton',
'removeButton',
'previousButton',
'nextButton',
'counterLabel',
SDL.RPCViewHelper.getBackButton(),
SDL.RPCViewHelper.getQueueControls('SubscribeVehicleData'),
'subscribevehicleData',
'subscribevehicleDataParams'
],
backButton: SDL.Button.extend(
{
classNames: [
'backControl'
],
action: 'onState',
target: 'SDL.SettingsController',
goToState: 'rpccontrol',
icon: 'images/media/ico_back.png',
style: 'top: 100px',
onDown: false
}),
newButton: SDL.Button.extend(
{
classNames: [
'newButton'
],
action: 'newSubscribeVehicleData',
target: 'FFW.RPCHelper',
text: 'New',
onDown: false
}),
removeButton: SDL.Button.extend(
{
classNames: [
'removeButton'
],
isDisabled: function() {
return FFW.RPCHelper.SubscribeVehicleDataResultCodes.length == 1;
}.property(
'FFW.RPCHelper.SubscribeVehicleDataIndex'

),
disabledBinding: 'isDisabled',
action: 'removeSubscribeVehicleData',
target: 'FFW.RPCHelper',
text: 'Remove',
onDown: false
}),
previousButton: SDL.Button.extend(
{
classNames: [
'previousButton'
],
isDisabled: function() {
return FFW.RPCHelper.SubscribeVehicleDataIndex == 0;
}.property(
'FFW.RPCHelper.SubscribeVehicleDataIndex'
),
disabledBinding: 'isDisabled',
action: 'previousSubscribeVehicleData',
target: 'FFW.RPCHelper',
text: 'Previous',
onDown: false
}),
nextButton: SDL.Button.extend(
{
classNames: [
'nextButton'
],
isDisabled: function() {
return FFW.RPCHelper.SubscribeVehicleDataIndex ==
FFW.RPCHelper.SubscribeVehicleDataResultCodes.length - 1;
}.property(
'FFW.RPCHelper.SubscribeVehicleDataIndex'
),
disabledBinding: 'isDisabled',
action: 'nextSubscribeVehicleData',
target: 'FFW.RPCHelper',
text: 'Next',
onDown: false
}),
counterLabel: SDL.Label.extend(
{
elementId: 'counterLabel',
classNames: 'counterLabel',
contentBinding: 'FFW.RPCHelper.SubscribeVehicleDataResponseStatus'
}),
subscribevehicleData: Em.ContainerView.create(
{
elementId: 'subscribevehicleData',
Expand Down Expand Up @@ -154,7 +72,7 @@ SDL.RPCVehicleDataControlConfigView = Em.ContainerView.create({
}
this.isFirstInitialization = false;

for(var viewsName in FFW.RPCHelper.SubscribeVehicleDataParams){
for(viewsName of FFWSubscribeVehicleDataParams){
selectValueBinding = 'FFW.RPCHelper.SubscribeVehicleData.SubscribeVehicleDataParams.' + viewsName;
this.get('subscribevehicleDataParams.childViews').pushObject(Em.ContainerView.create({
elementId: viewsName,
Expand Down
136 changes: 136 additions & 0 deletions app/view/settings/RPCControls/RPCViewHelper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
/*
* Copyright (c) 2018, Ford Motor Company All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: ·
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer. · Redistributions in binary
* form must reproduce the above copyright notice, this list of conditions and
* the following disclaimer in the documentation and/or other materials provided
* with the distribution. · Neither the name of the Ford Motor Company nor the
* names of its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

SDL.RPCViewHelper = {
/*
* getBackButton function. returns the backspace button.
*/
getBackButton: function(){
return SDL.Button.extend({
classNames: [
'backControl'
],
action: 'onState',
target: 'SDL.SettingsController',
goToState: 'rpccontrol',
icon: 'images/media/ico_back.png',
style: 'top: 100px',
onDown: false
});
},

/*
* getQueueControls function. returns the queue control buttons.
*/
getQueueControls: function(rpc){
return Em.ContainerView.create({
childViews: [
'newButton',
'removeButton',
'previousButton',
'nextButton',
'counterLabel',
],

newButton: SDL.Button.extend({
classNames: [
'newButton'
],
action: 'new' + rpc,
target: 'FFW.RPCHelper',
text: 'New',
onDown: false
}),

removeButton: SDL.Button.extend({
classNames: [
'removeButton'
],

isDisabled: function() {
return FFW.RPCHelper[rpc + 'ResultCodes'].length == 1;
}.property('FFW.RPCHelper.' + rpc + 'Index'),

disabledBinding: 'isDisabled',
action: 'remove' + rpc,
target: 'FFW.RPCHelper',
text: 'Remove',
onDown: false
}),

previousButton: SDL.Button.extend({
classNames: [
'previousButton'
],

isDisabled: function() {
return FFW.RPCHelper[rpc + 'Index'] == 0;
}.property('FFW.RPCHelper.' + rpc + 'Index'),

disabledBinding: 'isDisabled',
action: 'previous' + rpc,
target: 'FFW.RPCHelper',
text: 'Previous',
onDown: false
}),

nextButton: SDL.Button.extend({
classNames: [
'nextButton'
],

isDisabled: function() {
return FFW.RPCHelper[rpc + 'Index'] ==
FFW.RPCHelper[rpc + 'ResultCodes'].length - 1;
}.property('FFW.RPCHelper.' + rpc + 'Index'),

disabledBinding: 'isDisabled',
action: 'next' + rpc,
target: 'FFW.RPCHelper',
text: 'Next',
onDown: false
}),

counterLabel: SDL.Label.extend({
elementId: 'counterLabel',
classNames: 'counterLabel',
contentBinding: 'FFW.RPCHelper.' + rpc + 'ResponseStatus'
}),
});
},

/*
* getSingleSelect function. returns the select button.
*/
getSingleSelect: function(rpc){
return Em.Select.extend({
elementId: rpc + 'Select',
classNames: rpc + 'Select',
contentBinding: 'SDL.SDLModel.data.resultCodes',
valueBinding: 'FFW.RPCHelper.' + rpc
});
}
};
Loading

0 comments on commit 0737ce6

Please sign in to comment.