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-12131 Xref Upgrade #9107

Merged
merged 1 commit into from Sep 28, 2016
Merged

Conversation

miguelvazq
Copy link

Incorporate Xref into the new ecl watch paradigm.

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

@miguelvazq
Copy link
Author

@GordonSmith Please review.

@hpcc-jirabot
Copy link

@@ -0,0 +1,52 @@
/*##############################################################################
# HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
Copy link
Member

Choose a reason for hiding this comment

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

Year?

Copy link
Member

Choose a reason for hiding this comment

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

Actually I believe we don't need this copyright message in each file any more as the single licence.txt should suffice?

Copy link
Member

Choose a reason for hiding this comment

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

@fvillanustre Can you comment on what our policy on copyright messages in files needs to be?

// Hitched actions ---
_onAutoRefresh: function (event) {
this.wu.disableMonitor(!this.widget.AutoRefresh.get("checked"));
},
Copy link
Member

Choose a reason for hiding this comment

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

This method should be removed?

},
_onRefresh: function (event) {
this.wu.refresh(true);
},
Copy link
Member

Choose a reason for hiding this comment

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

This should be removed?

},
_onGenerate: function (event) {

},
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 do something?


_onCancel: function (event) {

},
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 do something?


initTab: function () {
var currSel = this.getSelectedChild();
if (currSel.id == this.widget._FoundFiles.id && !this.widget._FoundFiles.__hpcc_initalized) {
Copy link
Member

Choose a reason for hiding this comment

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

FYI: At some point all these "==" will be replaced with "===" (I will be turning on the linting test for it).

Copy link
Author

Choose a reason for hiding this comment

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

I started seeing those in your code review and the for (key will now == for (var key

id: this.id + "Generate",
disabled: false,
onClick: function (val) {
if (confirm("Running this process may take a long time and will put a heavy strain on the servers. Do you wish to continue?")) {
Copy link
Member

Choose a reason for hiding this comment

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

translation

context.dialog.show();
},
label: "Errors/Warnings"
}).placeAt(this.directories.domNode, "after");*/
Copy link
Member

Choose a reason for hiding this comment

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

remove commented code.

new ToolbarSeparator().placeAt(this.cancel.domNode, "after");
/*new ToolbarSeparator().placeAt(this.errorWarnings.domNode, "after");
new ToolbarSeparator().placeAt(this.openButton.domNode, "after");
new ToolbarSeparator().placeAt(this.foundFiles.domNode, "before");*/
Copy link
Member

Choose a reason for hiding this comment

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

remove commented code.

return retVal;
return {
Name: "SuperFiles"
}*/
Copy link
Member

Choose a reason for hiding this comment

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

remove commented code.

});
});
context.store.setData(newRows);
context.grid.set("query", /*this.getFilter()*/{});
Copy link
Member

Choose a reason for hiding this comment

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

remove commentedd code and all refs to filters?

@richardkchapman
Copy link
Member

@miguelvazq Back to you

@miguelvazq
Copy link
Author

@GordonSmith Updated

@@ -277,6 +290,9 @@ define({root:
Log: "Log",
Logs: "Logs",
log_analysis_1: "log_analysis_1*",
LostFile: "Lost Files:",
LostFile2: "Lost File:",
Copy link
Member

Choose a reason for hiding this comment

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

Are the ":" going to be moved into the HTML?

@@ -344,6 +364,9 @@ define({root:
Operations: "Operations",
Options: "Options",
OriginalFile: "Original File",
OrphanFile: "Orphan Files:",
OrphanFile2: "Orphan File:",
Copy link
Member

Choose a reason for hiding this comment

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

Are the ":" going to be moved into the HTML?

@@ -556,12 +587,15 @@ define({root:
title_AvailableGroupPermissions: "Available Group Permissions",
title_ClusterInfo: "Groups",
title_CodeGeneratorPermissions: "Code Generator Permissions",
title_DirectoriesFor: "Directories for:",
Copy link
Member

Choose a reason for hiding this comment

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

Are the ":" going to be moved into the HTML?

title_DFUQuery: "Logical Files",
title_DFUWUDetails: "DFU Workunit",
title_DiskUsage: "Disk Usage",
title_ECLPlayground: "ECL Playground",
title_ErrorsWarnings: "Errors/Warnings for:",
Copy link
Member

Choose a reason for hiding this comment

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

Are the ":" going to be moved into the HTML?

title_EventScheduleWorkunit: "Event Scheduler",
title_FileScopeDefaultPermissions: "Default permissions of files",
title_FoundFilesFor: "Found files for:",
Copy link
Member

Choose a reason for hiding this comment

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

Are the ":" going to be moved into the HTML?

@@ -579,7 +613,9 @@ define({root:
title_LZBrowse: "Landing Zones",
title_MemberOf: "Member Of",
title_Members: "Members",
title_LostFilesFor: "Lost files for:",
Copy link
Member

Choose a reason for hiding this comment

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

Are the ":" going to be moved into the HTML?

title_LibrariesUsed: "Libraries Used",
title_OrphanFilesFor: "Orphan files for:",
Copy link
Member

Choose a reason for hiding this comment

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

Are the ":" going to be moved into the HTML?

@@ -248,10 +257,14 @@ define({root:
Largest: "Largest",
LargestFile: "Largest File",
LargestSize: "Largest Size",
LastMessage: "Last Message",
LastMessage2: "Last Message",
Copy link
Member

Choose a reason for hiding this comment

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

LastMessage2 Not needed (same as LastMessage)

LastName: "Last Name",
LastNDays: "Last N Days",
LastNHours: "Last N Hours",
LastNRows: "Last N Rows",
LastRun: "Last Run",
LastRun2: "Last Run",
Copy link
Member

Choose a reason for hiding this comment

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

LastRun2 duplicate of LastRun

@richardkchapman
Copy link
Member

@miguelvazq Back to you

@miguelvazq
Copy link
Author

@GordonSmith updated.

@miguelvazq miguelvazq force-pushed the XrefUpgrade branch 2 times, most recently from 0849c7d to f6f50a9 Compare September 23, 2016 14:06
Name: {label: this.i18n.Name, width:100, sortable: false},
Modified: {label: this.i18n.Modified, width: 30, sortable: true},
Parts: {label: this.i18n.Parts, width: 30, sortable: true},
Size: {label: this.i18n.Size, width: 30, sortable: true},
Copy link
Member

Choose a reason for hiding this comment

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

Trailing ","

this.refreshGrid();
},

createGrid: function (domID) {\
Copy link
Member

Choose a reason for hiding this comment

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

trailing ""

}
},
Modified: {label: this.i18n.LastRun, width: 30, sortable: false},
Status: {label: this.i18n.LastMessage, width: 30, sortable: false},
Copy link
Member

Choose a reason for hiding this comment

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

trailing ","

this.store.getChildren = function (parent, options) {
var retVal = this.query({__hpcc_parentName: parent.__hpcc_id}, options);
return retVal;
};*/
Copy link
Member

Choose a reason for hiding this comment

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

Still needs removing

id: this.id + "Generate",
disabled: false,
onClick: function (val) {
if (confirm("Running this process may take a long time and will put a heavy strain on the servers. Do you wish to continue?")) {
Copy link
Member

Choose a reason for hiding this comment

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

Still needs translation

context.dialog.show();
},
label: "Errors/Warnings"
}).placeAt(this.directories.domNode, "after");*/
Copy link
Member

Choose a reason for hiding this comment

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

Commented code still needs removing

new ToolbarSeparator().placeAt(this.cancel.domNode, "after");
/*new ToolbarSeparator().placeAt(this.errorWarnings.domNode, "after");
new ToolbarSeparator().placeAt(this.openButton.domNode, "after");
new ToolbarSeparator().placeAt(this.foundFiles.domNode, "before");*/
Copy link
Member

Choose a reason for hiding this comment

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

Needs removing

return retVal;
return {
Name: "SuperFiles"
}*/
Copy link
Member

Choose a reason for hiding this comment

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

commented code

});
});
context.store.setData(newRows);
context.grid.set("query", /*this.getFilter()*/{});
Copy link
Member

Choose a reason for hiding this comment

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

Commented code.

id = this.createChildTabID(id);
var retVal = registry.byId(id);
if (!retVal) {
var context = this;
Copy link
Member

Choose a reason for hiding this comment

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

Context can be removed?

@miguelvazq miguelvazq force-pushed the XrefUpgrade branch 2 times, most recently from 3195cbd to bc84374 Compare September 26, 2016 15:15
@miguelvazq
Copy link
Author

miguelvazq commented Sep 26, 2016

@GordonSmith I removed an accidental file that was added into templates. The ones with the commented code comments. All else was updated.

Incorporate Xref into the new ecl watch paradigm.

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

Automated Smoketest
Sha: 5a0fb3b
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 richardkchapman merged commit e4884ae into hpcc-systems:master Sep 28, 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
6 participants