ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-21 08:39:59 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

linting fixes

Browse Source
This commit is contained in:
Jamie Vigliotta
2020-08-14 10:44:02 -07:00
parent c33c29b6f3 891fe0a36b
commit 33c37ebf19
813 changed files with 7410 additions and 4438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/LADTable/LADTableCompositionPolicy.js
View File

@ -22,11 +22,12 @@
export default function ladTableCompositionPolicy(openmct) {
return function (parent, child) {
if(parent.type === 'LadTable') {
if (parent.type === 'LadTable') {
return openmct.telemetry.isTelemetryObject(child);
} else if(parent.type === 'LadTableSet') {
} else if (parent.type === 'LadTableSet') {
return child.type === 'LadTable';
}
return true;
}
};
}

2
src/plugins/LADTable/LADTableSetViewProvider.js
View File

@ -38,7 +38,7 @@ export default function LADTableSetViewProvider(openmct) {
return {
show: function (element) {
component = new Vue({
component = new Vue({
el: element,
components: {
LadTableSet: LadTableSet

2
src/plugins/LADTable/LADTableViewProvider.js
View File

@ -38,7 +38,7 @@ export default function LADTableViewProvider(openmct) {
return {
show: function (element) {
component = new Vue({
component = new Vue({
el: element,
components: {
LadTableComponent: LadTable

21
src/plugins/LADTable/components/LADRow.vue
View File

@ -71,7 +71,7 @@ export default {
valueClass: '',
currentObjectPath,
unit: ''
}
};
},
computed: {
formattedTimestamp() {
@ -105,7 +105,7 @@ export default {
.metadata
.valuesForHints(['range'])[0];
this.valueKey = this.valueMetadata.key
this.valueKey = this.valueMetadata.key;
this.unsubscribe = this.openmct
.telemetry
@ -125,8 +125,8 @@ export default {
},
methods: {
updateValues(datum) {
let newTimestamp = this.getParsedTimestamp(datum),
limit;
let newTimestamp = this.getParsedTimestamp(datum);
let limit;
if (this.shouldUpdate(newTimestamp)) {
this.timestamp = newTimestamp;
@ -140,12 +140,12 @@ export default {
}
},
shouldUpdate(newTimestamp) {
let newTimestampInBounds = this.inBounds(newTimestamp),
noExistingTimestamp = this.timestamp === undefined,
newTimestampIsLatest = newTimestamp > this.timestamp;
let newTimestampInBounds = this.inBounds(newTimestamp);
let noExistingTimestamp = this.timestamp === undefined;
let newTimestampIsLatest = newTimestamp > this.timestamp;
return newTimestampInBounds &&
(noExistingTimestamp || newTimestampIsLatest);
return newTimestampInBounds
&& (noExistingTimestamp || newTimestampIsLatest);
},
requestHistory() {
this.openmct
@ -198,6 +198,7 @@ export default {
return true;
} else {
console.warn(`No formatter for ${this.timestampKey} time system for ${this.domainObject.name}.`);
return false;
}
},
@ -205,6 +206,6 @@ export default {
this.unit = this.valueMetadata.unit || '';
}
}
}
};
</script>

15
src/plugins/LADTable/components/LADTable.vue
View File

@ -54,6 +54,18 @@ export default {
data() {
return {
items: []
};
},
computed: {
hasUnits() {
let itemsWithUnits = this.items.filter((item) => {
let metadata = this.openmct.telemetry.getMetadata(item.domainObject);
return this.metadataHasUnits(metadata.valueMetadatas);
});
return itemsWithUnits.length !== 0;
}
},
computed: {
@ -99,8 +111,9 @@ export default {
},
metadataHasUnits(valueMetadatas) {
let metadataWithUnits = valueMetadatas.filter(metadatum => metadatum.unit);
return metadataWithUnits.length > 0;
}
}
}
};
</script>

27
src/plugins/LADTable/components/LadTableSet.vue
View File

@ -66,21 +66,22 @@ export default {
ladTableObjects: [],
ladTelemetryObjects: {},
compositions: []
}
};
},
computed: {
hasUnits() {
let telemetryObjects = Object.values(this.ladTelemetryObjects);
for(let telemtryObjectsByKey of telemetryObjects) {
for(let telemetryObject of telemtryObjectsByKey) {
let ladTables = Object.values(this.ladTelemetryObjects);
for (let ladTable of ladTables) {
for (let telemetryObject of ladTable) {
let metadata = this.openmct.telemetry.getMetadata(telemetryObject.domainObject);
for(let metadatum of metadata.valueMetadatas) {
if(metadatum.unit) {
for (let metadatum of metadata.valueMetadatas) {
if (metadatum.unit) {
return true;
}
}
}
}
return false;
}
},
@ -109,15 +110,19 @@ export default {
this.$set(this.ladTelemetryObjects, ladTable.key, []);
this.ladTableObjects.push(ladTable);
let composition = this.openmct.composition.get(ladTable.domainObject),
addCallback = this.addTelemetryObject(ladTable),
removeCallback = this.removeTelemetryObject(ladTable);
let composition = this.openmct.composition.get(ladTable.domainObject);
let addCallback = this.addTelemetryObject(ladTable);
let removeCallback = this.removeTelemetryObject(ladTable);
composition.on('add', addCallback);
composition.on('remove', removeCallback);
composition.load();
this.compositions.push({composition, addCallback, removeCallback});
this.compositions.push({
composition,
addCallback,
removeCallback
});
},
removeLadTable(identifier) {
let index = this.ladTableObjects.findIndex(ladTable => this.openmct.objects.makeKeyString(identifier) === ladTable.key);
@ -155,5 +160,5 @@ export default {
}
}
}
}
};
</script>

234
src/plugins/LADTable/pluginSpec.js
View File

@ -37,27 +37,30 @@ const TABLE_BODY_FIRST_ROW_THIRD_DATA = TABLE_BODY_FIRST_ROW + ' .js-third-data'
const LAD_SET_TABLE_HEADERS = '.js-lad-table-set__table-headers';
function utcTimeFormat(value) {
return new Date(value).toISOString().replace('T', ' ')
return new Date(value).toISOString().replace('T', ' ');
}
describe("The LAD Table", () => {
const ladTableKey = 'LadTable';
let openmct,
ladPlugin,
parent,
child,
telemetryCount = 3,
timeFormat = 'utc',
mockTelemetry = getMockTelemetry({ count: telemetryCount, format: timeFormat }),
mockObj = getMockObjects({
objectKeyStrings: ['ladTable', 'telemetry'],
format: timeFormat
}),
bounds = {
start: 0,
end: 4
};
let openmct;
let ladPlugin;
let parent;
let child;
let telemetryCount = 3;
let timeFormat = 'utc';
let mockTelemetry = getMockTelemetry({
count: telemetryCount,
format: timeFormat
});
let mockObj = getMockObjects({
objectKeyStrings: ['ladTable', 'telemetry'],
format: timeFormat
});
let bounds = {
start: 0,
end: 4
};
// add telemetry object as composition in lad table
mockObj.ladTable.composition.push(mockObj.telemetry.identifier);
@ -81,21 +84,25 @@ describe("The LAD Table", () => {
spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
openmct.time.bounds({ start: bounds.start, end: bounds.end });
openmct.time.bounds({
start: bounds.start,
end: bounds.end
});
openmct.on('start', done);
openmct.startHeadless(appHolder);
});
afterEach(() => {
resetApplicationState(openmct);
return resetApplicationState(openmct);
});
it("should provide a table view only for lad table objects", () => {
let applicableViews = openmct.objectViews.get(mockObj.ladTable),
ladTableView = applicableViews.find(
(viewProvider) => viewProvider.key === ladTableKey
);
let applicableViews = openmct.objectViews.get(mockObj.ladTable);
let ladTableView = applicableViews.find(
(viewProvider) => viewProvider.key === ladTableKey
);
expect(applicableViews.length).toEqual(1);
expect(ladTableView).toBeDefined();
@ -116,57 +123,67 @@ describe("The LAD Table", () => {
});
it("should reject non-telemtry producing objects", () => {
expect(()=> {
expect(() => {
ladTableCompositionCollection.add(mockObj.ladTable);
}).toThrow();
});
});
describe("table view", () => {
let applicableViews,
ladTableViewProvider,
ladTableView,
anotherTelemetryObj = getMockObjects({
objectKeyStrings: ['telemetry'],
overwrite: {
telemetry: {
name: "New Telemetry Object",
identifier: { namespace: "", key: "another-telemetry-object" }
let applicableViews;
let ladTableViewProvider;
let ladTableView;
let anotherTelemetryObj = getMockObjects({
objectKeyStrings: ['telemetry'],
overwrite: {
telemetry: {
name: "New Telemetry Object",
identifier: {
namespace: "",
key: "another-telemetry-object"
}
}
}).telemetry;
}
}).telemetry;
// add another telemetry object as composition in lad table to test multi rows
mockObj.ladTable.composition.push(anotherTelemetryObj.identifier);
beforeEach(async () => {
let telemetryRequestResolve,
telemetryObjectResolve,
anotherTelemetryObjectResolve;
let telemetryRequestResolve;
let telemetryObjectResolve;
let anotherTelemetryObjectResolve;
let telemetryRequestPromise = new Promise((resolve) => {
telemetryRequestResolve = resolve;
}),
telemetryObjectPromise = new Promise((resolve) => {
telemetryObjectResolve = resolve;
}),
anotherTelemetryObjectPromise = new Promise((resolve) => {
anotherTelemetryObjectResolve = resolve;
})
telemetryRequestResolve = resolve;
});
let telemetryObjectPromise = new Promise((resolve) => {
telemetryObjectResolve = resolve;
});
let anotherTelemetryObjectPromise = new Promise((resolve) => {
anotherTelemetryObjectResolve = resolve;
});
openmct.telemetry.request.and.callFake(() => {
telemetryRequestResolve(mockTelemetry);
return telemetryRequestPromise;
});
openmct.objects.get.and.callFake((obj) => {
if(obj.key === 'telemetry-object') {
if (obj.key === 'telemetry-object') {
telemetryObjectResolve(mockObj.telemetry);
return telemetryObjectPromise;
} else {
anotherTelemetryObjectResolve(anotherTelemetryObj);
return anotherTelemetryObjectPromise;
}
});
openmct.time.bounds({ start: bounds.start, end: bounds.end });
openmct.time.bounds({
start: bounds.start,
end: bounds.end
});
applicableViews = openmct.objectViews.get(mockObj.ladTable);
ladTableViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableKey);
@ -175,6 +192,7 @@ describe("The LAD Table", () => {
await Promise.all([telemetryRequestPromise, telemetryObjectPromise, anotherTelemetryObjectPromise]);
await Vue.nextTick();
return;
});
@ -192,8 +210,9 @@ describe("The LAD Table", () => {
});
it("should show the name provided for the the telemetry producing object", () => {
const rowName = parent.querySelector(TABLE_BODY_FIRST_ROW_FIRST_DATA).innerText,
expectedName = mockObj.telemetry.name;
const rowName = parent.querySelector(TABLE_BODY_FIRST_ROW_FIRST_DATA).innerText;
const expectedName = mockObj.telemetry.name;
expect(rowName).toBe(expectedName);
});
@ -219,26 +238,34 @@ describe("The LAD Table", () => {
describe("The LAD Table Set", () => {
const ladTableSetKey = 'LadTableSet';
let openmct,
ladPlugin,
parent,
child,
telemetryCount = 3,
timeFormat = 'utc',
mockTelemetry = getMockTelemetry({ count: telemetryCount, format: timeFormat }),
mockObj = getMockObjects({
objectKeyStrings: ['ladTable', 'ladTableSet', 'telemetry']
}),
bounds = {
start: 0,
end: 4
};
let openmct;
let ladPlugin;
let parent;
let child;
let telemetryCount = 3;
let timeFormat = 'utc';
let mockTelemetry = getMockTelemetry({
count: telemetryCount,
format: timeFormat
});
let mockObj = getMockObjects({
objectKeyStrings: ['ladTable', 'ladTableSet', 'telemetry']
});
let bounds = {
start: 0,
end: 4
};
// add mock telemetry to lad table and lad table to lad table set (composition)
mockObj.ladTable.composition.push(mockObj.telemetry.identifier);
mockObj.ladTableSet.composition.push(mockObj.ladTable.identifier);
beforeEach((done) => {
const appHolder = document.createElement('div');
appHolder.style.width = '640px';
appHolder.style.height = '480px';
@ -255,21 +282,25 @@ describe("The LAD Table Set", () => {
spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
openmct.time.bounds({ start: bounds.start, end: bounds.end });
openmct.time.bounds({
start: bounds.start,
end: bounds.end
});
openmct.on('start', done);
openmct.start(appHolder);
});
afterEach(() => {
resetApplicationState(openmct);
return resetApplicationState(openmct);
});
it("should provide a lad table set view only for lad table set objects", () => {
let applicableViews = openmct.objectViews.get(mockObj.ladTableSet),
ladTableSetView = applicableViews.find(
(viewProvider) => viewProvider.key === ladTableSetKey
);
let applicableViews = openmct.objectViews.get(mockObj.ladTableSet);
let ladTableSetView = applicableViews.find(
(viewProvider) => viewProvider.key === ladTableSetKey
);
expect(applicableViews.length).toEqual(1);
expect(ladTableSetView).toBeDefined();
@ -290,60 +321,75 @@ describe("The LAD Table Set", () => {
});
it("should reject non lad table objects", () => {
expect(()=> {
expect(() => {
ladTableSetCompositionCollection.add(mockObj.telemetry);
}).toThrow();
});
});
describe("table view", () => {
let applicableViews,
ladTableSetViewProvider,
ladTableSetView,
otherObj = getMockObjects({
objectKeyStrings: ['ladTable'],
overwrite: {
ladTable: {
name: "New LAD Table Object",
identifier: { namespace: "", key: "another-lad-object" }
let applicableViews;
let ladTableSetViewProvider;
let ladTableSetView;
let otherObj = getMockObjects({
objectKeyStrings: ['ladTable'],
overwrite: {
ladTable: {
name: "New LAD Table Object",
identifier: {
namespace: "",
key: "another-lad-object"
}
}
});
}
});
// add another lad table (with telemetry object) object to the lad table set for multi row test
otherObj.ladTable.composition.push(mockObj.telemetry.identifier);
mockObj.ladTableSet.composition.push(otherObj.ladTable.identifier);
beforeEach(async () => {
let telemetryRequestResolve,
ladObjectResolve,
anotherLadObjectResolve;
let telemetryRequestResolve;
let ladObjectResolve;
let anotherLadObjectResolve;
let telemetryRequestPromise = new Promise((resolve) => {
telemetryRequestResolve = resolve;
}),
ladObjectPromise = new Promise((resolve) => {
ladObjectResolve = resolve;
}),
anotherLadObjectPromise = new Promise((resolve) => {
anotherLadObjectResolve = resolve;
})
telemetryRequestResolve = resolve;
});
let ladObjectPromise = new Promise((resolve) => {
ladObjectResolve = resolve;
});
let anotherLadObjectPromise = new Promise((resolve) => {
anotherLadObjectResolve = resolve;
});
openmct.telemetry.request.and.callFake(() => {
telemetryRequestResolve(mockTelemetry);
return telemetryRequestPromise;
});
openmct.objects.get.and.callFake((obj) => {
if(obj.key === 'lad-object') {
if (obj.key === 'lad-object') {
ladObjectResolve(mockObj.ladObject);
return ladObjectPromise;
} else if(obj.key === 'another-lad-object') {
} else if (obj.key === 'another-lad-object') {
anotherLadObjectResolve(otherObj.ladObject);
return anotherLadObjectPromise;
}
return Promise.resolve({});
});
openmct.time.bounds({ start: bounds.start, end: bounds.end });
openmct.time.bounds({
start: bounds.start,
end: bounds.end
});
applicableViews = openmct.objectViews.get(mockObj.ladTableSet);
ladTableSetViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableSetKey);
@ -352,11 +398,13 @@ describe("The LAD Table Set", () => {
await Promise.all([telemetryRequestPromise, ladObjectPromise, anotherLadObjectPromise]);
await Vue.nextTick();
return;
});
it("should show one row per lad table object in the composition", () => {
const rowCount = parent.querySelectorAll(LAD_SET_TABLE_HEADERS).length;
expect(rowCount).toBe(mockObj.ladTableSet.composition.length);
pending();
});