Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-14453 Preflight upgrade #9165

Merged
merged 1 commit into from
Sep 29, 2016

Conversation

miguelvazq
Copy link

Add pre flight submission form into new ECL Watch.

Signed-off by: Miguel Vazquez miguel.vazquez@lexisnexis.com

@miguelvazq
Copy link
Author

@GordonSmith Please review.

@hpcc-jirabot
Copy link

return retVal;
},

getColumns: function (params) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be called "setColumns" or "setGridColumns"?

var clean = finalColumns[index].replace(/([~!@#$%^&*()_+=`{}\[\]\|\\:;'<>,.\/? ])+/g, '').replace(/^(-)+|(-)+$/g,'');
if (clean === 'Condition') {
lang.mixin(dynamicColumns, {
[clean] : {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this syntax do (I have not seen it before)?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This creates dynamic properties with the value from clean which in turn is 'Condition' 'State' 'RoxieCluster'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know you could do that with this syntax!

if (params) {
var finalColumns = params.Columns.Item;
for (index in finalColumns) {
var clean = finalColumns[index].replace(/([~!@#$%^&*()_+=`{}\[\]\|\\:;'<>,.\/? ])+/g, '').replace(/^(-)+|(-)+$/g,'');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this removing HTML formatting?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the response returns "Column Name" I am removing any spaces and or special characters in it so that they come back like so: "ColumnName"

}
}
});
} if (clean === 'State') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "if" should be on a new line.

WsMachine.GetMachineInfo ({
request: {
[MachineInformationClean]: filter[MachineInformationClean],
[MachineInformationCount]: 1000,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this syntax correct?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verified with @wangkx this count seems to increase based on selections and is subjective.

WsMachine.GetTargetClusterInfo ({
request: {
[TargetClustersClean]: filter[TargetClustersClean],
[TargetClusterCount]: 1000,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this syntax correct?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verified with @wangkx this count seems to increase based on selections and is subjective.

},

createLabelAndElement: function (id, label, element, placeholder, value) {
var context = this;
Copy link
Member

@GordonSmith GordonSmith Sep 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should declare var control; here and then assign values to it in the switch statement

@GordonSmith
Copy link
Member

Some questions.

@miguelvazq
Copy link
Author

@GordonSmith updated.

@richardkchapman
Copy link
Member

@miguelvazq Needs rebasing for a clean merge

@miguelvazq
Copy link
Author

@richardkchapman rebased.

@@ -1 +1 @@
Subproject commit 468db35af8875930d424395808ddc9523c57c6f2
Subproject commit d7bbad34db39a51f209c6fadd07c9ec3a0bb86b7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not be in this PR


table.miniSelect span {
width:20px;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this for an edit in place control?

Copy link
Author

@miguelvazq miguelvazq Sep 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for the selects that are smaller in nature such as "%" and or "MB"

var control = element;
switch (element) {
case "CheckBox":
var control = new CheckBox ({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

var control should be declared outside of the switch for clarity.

});
break;
case "TextBox":
var control = new ValidationTextBox ({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

var control should be declared outside of the switch for clarity.

});
break;
case "Select":
var control = new Select ({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

var control should be declared outside of the switch for clarity.

});
break;
case "SelectMini":
var control = new Select ({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

var control should be declared outside of the switch for clarity.

style: "vertical-align:middle;padding:2px 0 2px 5px;"
})
)
control.placeAt(this.id + id);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

control is used outside of swicth - so var control should be declared before the switch statement, in case none of the branches are called.

Add pre flight submission form into new ECL Watch.

Signed-off by: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
@miguelvazq
Copy link
Author

@GordonSmith changes made after latest comments

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest
Sha: 37283ae
Build: success
Install hpccsystems-platform-community_6.1.0-trunk0.el6.x86_64.rpm
HPCC Start: OK
Unittest result: total:83 passed:83 failed:0

HPCC Stop: OK
HPCC Uninstall: OK

@richardkchapman
Copy link
Member

@GordonSmith Please re-review/approve

@GordonSmith
Copy link
Member

Good to go.

@richardkchapman richardkchapman merged commit a0d0054 into hpcc-systems:master Sep 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants