addressed review comments

This commit is contained in:
Joel McKinnon 2019-12-18 12:48:05 -08:00
parent 4a1901420d
commit 656d6d6c3f
6 changed files with 15 additions and 15 deletions

View File

@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government
* Open MCT, Copyright (c) 2014-2019, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@ -264,7 +264,7 @@ define([
this.install(this.plugins.GoToOriginalAction());
this.install(this.plugins.ImportExport());
this.install(this.plugins.WebPage());
this.install(this.plugins.Condition());
this.install(this.plugins.ConditionSet());
}
MCT.prototype = Object.create(EventEmitter.prototype);

View File

@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government
* Open MCT, Copyright (c) 2014-2019, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@ -20,16 +20,16 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
export default function ConditionSetPlugin() {
export default function plugin() {
const conditionSetType = {
name: 'Condition Set',
key: 'conditionSet',
description: 'A set of one or more conditional rules based on user-specified criteria.',
description: 'A set of one or more conditions based on user-specified criteria.',
creatable: true,
cssClass: 'icon-summary-widget',
initialize: function (domainObject) {
domainObject.composition = [];
domainObject.telemetry = {};
// domainObject.telemetry = {};
}
};

View File

@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government
* Open MCT, Copyright (c) 2014-2019, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@ -23,7 +23,7 @@
import ConditionSetPlugin from './plugin';
import { createOpenMct } from 'testTools';
describe("The plugin", () => {
fdescribe("The plugin", () => {
let openmct;
let mockDomainObject;
@ -57,9 +57,9 @@ describe("The plugin", () => {
expect(Array.isArray(mockDomainObject.composition)).toBeTrue();
});
it('a telemetry object', () => {
expect(typeof mockDomainObject.telemetry === 'object').toBeTrue();
});
// it('a telemetry object', () => {
// expect(typeof mockDomainObject.telemetry === 'object').toBeTrue();
// });
});
});

View File

@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government
* Open MCT, Copyright (c) 2014-2019, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@ -47,7 +47,7 @@ define([
'./goToOriginalAction/plugin',
'./clearData/plugin',
'./webPage/plugin',
'./condition/plugin',
'./conditionSet/plugin',
'./themes/espresso',
'./themes/maelstrom',
'./themes/snow'
@ -78,7 +78,7 @@ define([
GoToOriginalAction,
ClearData,
WebPagePlugin,
ConditionPlugin,
ConditionSetPlugin,
Espresso,
Maelstrom,
Snow
@ -184,7 +184,7 @@ define([
plugins.GoToOriginalAction = GoToOriginalAction.default;
plugins.ClearData = ClearData;
plugins.WebPage = WebPagePlugin.default;
plugins.Condition = ConditionPlugin.default;
plugins.ConditionSet = ConditionSetPlugin.default;
plugins.Espresso = Espresso.default;
plugins.Maelstrom = Maelstrom.default;
plugins.Snow = Snow.default;