Skip to content

Commit 8a85336

Browse files
authored
Merge pull request #19580 from jeclrsg/hpcc-33573-remove-def-file-references
HPCC-33573 ECL Watch remove DFUDefFile requests for DEF format
2 parents b4d7c28 + a887f71 commit 8a85336

File tree

3 files changed

+0
-19
lines changed

3 files changed

+0
-19
lines changed

esp/src/eclwatch/LFDetailsWidget.js

-10
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ define([
7171
contentWidget: null,
7272
dataPatternsWidget: null,
7373
sourceWidget: null,
74-
defWidget: null,
7574
xmlWidget: null,
7675
filePartsWidget: null,
7776
queriesWidget: null,
@@ -95,7 +94,6 @@ define([
9594
this.contentWidget = registry.byId(this.id + "_Content");
9695
this.dataPatternsWidget = registry.byId(this.id + "_DataPatterns");
9796
this.sourceWidget = registry.byId(this.id + "_Source");
98-
this.defWidget = registry.byId(this.id + "_DEF");
9997
this.xmlWidget = registry.byId(this.id + "_XML");
10098
this.filePartsWidget = registry.byId(this.id + "_FileParts");
10199
this.queriesWidget = registry.byId(this.id + "_Queries");
@@ -306,13 +304,6 @@ define([
306304
this.sourceWidget.init({
307305
ECL: this.logicalFile.Ecl
308306
});
309-
} else if (currSel.id === this.defWidget.id) {
310-
var context = this;
311-
this.logicalFile.fetchDEF(function (response) {
312-
context.defWidget.init({
313-
ECL: response
314-
});
315-
});
316307
} else if (currSel.id === this.xmlWidget.id) {
317308
var context = this;
318309
this.logicalFile.fetchXML(function (response) {
@@ -403,7 +394,6 @@ define([
403394
}
404395
this.contentWidget.reset();
405396
this.sourceWidget.reset();
406-
this.defWidget.reset();
407397
this.xmlWidget.reset();
408398
this.filePartsWidget.reset();
409399
this.widget._Queries.reset();

esp/src/eclwatch/templates/LFDetailsWidget.html

-2
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ <h2>
246246
</div>
247247
<div id="${id}_Source" title="${i18n.ECL}" data-dojo-props="delayWidget: 'ECLSourceWidget', disabled: true" data-dojo-type="DelayLoadWidget">
248248
</div>
249-
<div id="${id}_DEF" title="${i18n.DEF}" data-dojo-props="delayWidget: 'ECLSourceWidget', disabled: true" data-dojo-type="DelayLoadWidget">
250-
</div>
251249
<div id="${id}_XML" title="${i18n.XML}" data-dojo-props="delayProps: {WUXml: true}, delayWidget: 'ECLSourceWidget', disabled: true" data-dojo-type="DelayLoadWidget">
252250
</div>
253251
<div id="${id}_FileBelongs" title="${i18n.Superfiles}" data-dojo-props="delayWidget: 'FileBelongsToWidget', disabled: true" data-dojo-type="DelayLoadWidget">

esp/src/src-react/components/FileDetails.tsx

-7
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export const FileDetails: React.FunctionComponent<FileDetailsProps> = ({
4848
replaceUrl(`/files/${file.NodeGroup}/${logicalFile}`);
4949
}
5050
}, [cluster, file?.NodeGroup, file?.isSuperfile, logicalFile]);
51-
const [defFile] = useDefFile(cluster, logicalFile, WsDfu.DFUDefFileFormat.def);
5251
const [xmlFile] = useDefFile(cluster, logicalFile, WsDfu.DFUDefFileFormat.xml);
5352

5453
const onTabSelect = React.useCallback((tab: TabInfo) => {
@@ -69,9 +68,6 @@ export const FileDetails: React.FunctionComponent<FileDetailsProps> = ({
6968
}, {
7069
id: "ecl",
7170
label: nlsHPCC.ECL,
72-
}, {
73-
id: "def",
74-
label: nlsHPCC.DEF,
7571
}, {
7672
id: "xml",
7773
label: nlsHPCC.XML,
@@ -130,9 +126,6 @@ export const FileDetails: React.FunctionComponent<FileDetailsProps> = ({
130126
<DelayLoadedPanel visible={tab === "ecl"} size={size}>
131127
<SourceEditor text={file?.Ecl} mode="ecl" readonly={true} />
132128
</DelayLoadedPanel>
133-
<DelayLoadedPanel visible={tab === "def"} size={size}>
134-
<XMLSourceEditor text={defFile} readonly={true} />
135-
</DelayLoadedPanel>
136129
<DelayLoadedPanel visible={tab === "xml"} size={size}>
137130
<XMLSourceEditor text={xmlFile} readonly={true} />
138131
</DelayLoadedPanel>

0 commit comments

Comments
 (0)