mirror of
https://github.com/nasa/openmct.git
synced 2025-06-01 23:20:50 +00:00
Table migration (#2327)
* Added table migration code * First working version * Fixed issues with objects missing from composition
This commit is contained in:
Andrew Henry
Deep Tailor
parent
c7ffcbf7e0
commit
e3f4da19f9
@ -25,176 +25,220 @@ define([
|
|||||||
], function (
|
], function (
|
||||||
uuid
|
uuid
|
||||||
) {
|
) {
|
||||||
function isTelemetry(domainObject) {
|
return function Migrations(openmct) {
|
||||||
if (openmct.telemetry.isTelemetryObject(domainObject)
|
function getColumnNameKeyMap(domainObject) {
|
||||||
&& domainObject.type !== 'summary-widget'
|
let composition = openmct.composition.get(domainObject);
|
||||||
&& domainObject.type !== 'example.imagery') {
|
if (composition) {
|
||||||
return true;
|
return composition.load().then(composees => {
|
||||||
} else {
|
return composees.reduce((nameKeyMap, composee) => {
|
||||||
return false;
|
let metadata = openmct.telemetry.getMetadata(composee);
|
||||||
}
|
if (metadata !== undefined) {
|
||||||
}
|
metadata.values().forEach(value => {
|
||||||
|
nameKeyMap[value.name] = value.key;
|
||||||
function migrateDisplayLayout(domainObject, childObjects) {
|
});
|
||||||
const DEFAULT_GRID_SIZE = [32, 32];
|
}
|
||||||
let migratedObject = Object.assign({}, domainObject);
|
return nameKeyMap;
|
||||||
let panels = migratedObject.configuration.layout.panels;
|
}, {});
|
||||||
let items = [];
|
|
||||||
|
|
||||||
Object.keys(panels).forEach(key => {
|
|
||||||
let panel = panels[key];
|
|
||||||
let domainObject = childObjects[key];
|
|
||||||
|
|
||||||
if (isTelemetry(domainObject)) {
|
|
||||||
items.push({
|
|
||||||
width: panel.dimensions[0],
|
|
||||||
height: panel.dimensions[1],
|
|
||||||
x: panel.position[0],
|
|
||||||
y: panel.position[1],
|
|
||||||
useGrid: true,
|
|
||||||
identifier: domainObject.identifier,
|
|
||||||
id: uuid(),
|
|
||||||
type: 'telemetry-view',
|
|
||||||
displayMode: 'all',
|
|
||||||
value: openmct.telemetry.getMetadata(domainObject).getDefaultDisplayValue(),
|
|
||||||
stroke: "transparent",
|
|
||||||
fill: "",
|
|
||||||
color: "",
|
|
||||||
size: "13px"
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
items.push({
|
return Promise.resolve([]);
|
||||||
width: panel.dimensions[0],
|
|
||||||
height: panel.dimensions[1],
|
|
||||||
x: panel.position[0],
|
|
||||||
y: panel.position[1],
|
|
||||||
useGrid: true,
|
|
||||||
identifier: domainObject.identifier,
|
|
||||||
id: uuid(),
|
|
||||||
type: 'subobject-view',
|
|
||||||
hasFrame: panel.hasFrame
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
migratedObject.configuration.items = items;
|
|
||||||
migratedObject.configuration.layoutGrid = migratedObject.layoutGrid || DEFAULT_GRID_SIZE;
|
|
||||||
delete migratedObject.layoutGrid;
|
|
||||||
delete migratedObject.configuration.layout;
|
|
||||||
return migratedObject;
|
|
||||||
}
|
|
||||||
|
|
||||||
function migrateFixedPositionConfiguration(elements, telemetryObjects) {
|
|
||||||
const DEFAULT_STROKE = "transparent";
|
|
||||||
const DEFAULT_SIZE = "13px";
|
|
||||||
const DEFAULT_COLOR = "";
|
|
||||||
const DEFAULT_FILL = "";
|
|
||||||
let items = [];
|
|
||||||
|
|
||||||
elements.forEach(element => {
|
|
||||||
let item = {
|
|
||||||
x: element.x,
|
|
||||||
y: element.y,
|
|
||||||
width: element.width,
|
|
||||||
height: element.height,
|
|
||||||
useGrid: element.useGrid,
|
|
||||||
id: uuid()
|
|
||||||
};
|
|
||||||
|
|
||||||
if (element.type === "fixed.telemetry") {
|
|
||||||
item.type = "telemetry-view";
|
|
||||||
item.stroke = element.stroke || DEFAULT_STROKE;
|
|
||||||
item.fill = element.fill || DEFAULT_FILL;
|
|
||||||
item.color = element.color || DEFAULT_COLOR;
|
|
||||||
item.size = element.size || DEFAULT_SIZE;
|
|
||||||
item.identifier = telemetryObjects[element.id].identifier;
|
|
||||||
item.displayMode = element.titled ? 'all' : 'value';
|
|
||||||
item.value = openmct.telemetry.getMetadata(telemetryObjects[element.id]).getDefaultDisplayValue();
|
|
||||||
} else if (element.type === 'fixed.box') {
|
|
||||||
item.type = "box-view";
|
|
||||||
item.stroke = element.stroke || DEFAULT_STROKE;
|
|
||||||
item.fill = element.fill || DEFAULT_FILL;
|
|
||||||
} else if (element.type === 'fixed.line') {
|
|
||||||
item.type = "line-view";
|
|
||||||
item.x2 = element.x2;
|
|
||||||
item.y2 = element.y2;
|
|
||||||
item.stroke = element.stroke || DEFAULT_STROKE;
|
|
||||||
delete item.height;
|
|
||||||
delete item.width;
|
|
||||||
} else if (element.type === 'fixed.text') {
|
|
||||||
item.type = "text-view";
|
|
||||||
item.text = element.text;
|
|
||||||
item.stroke = element.stroke || DEFAULT_STROKE;
|
|
||||||
item.fill = element.fill || DEFAULT_FILL;
|
|
||||||
item.color = element.color || DEFAULT_COLOR;
|
|
||||||
item.size = element.size || DEFAULT_SIZE;
|
|
||||||
} else if (element.type === 'fixed.image') {
|
|
||||||
item.type = "image-view";
|
|
||||||
item.url =element.url;
|
|
||||||
item.stroke = element.stroke || DEFAULT_STROKE;
|
|
||||||
}
|
|
||||||
|
|
||||||
items.push(item);
|
|
||||||
});
|
|
||||||
|
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
check(domainObject) {
|
|
||||||
return domainObject.type === 'layout' && domainObject.configuration.layout;
|
|
||||||
},
|
|
||||||
migrate(domainObject) {
|
|
||||||
let childObjects = {};
|
|
||||||
let promises = Object.keys(domainObject.configuration.layout.panels).map(key => {
|
|
||||||
return openmct.objects.get(key)
|
|
||||||
.then(object => {
|
|
||||||
childObjects[key] = object;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return Promise.all(promises)
|
|
||||||
.then(function () {
|
|
||||||
return migrateDisplayLayout(domainObject, childObjects);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
check(domainObject) {
|
|
||||||
return domainObject.type === 'telemetry.fixed' && domainObject.configuration['fixed-display'];
|
|
||||||
},
|
|
||||||
migrate(domainObject) {
|
|
||||||
const DEFAULT_GRID_SIZE = [64, 16];
|
|
||||||
let newLayoutObject = {
|
|
||||||
identifier: domainObject.identifier,
|
|
||||||
location: domainObject.location,
|
|
||||||
name: domainObject.name,
|
|
||||||
type: "layout"
|
|
||||||
};
|
|
||||||
let layoutType = openmct.types.get('layout');
|
|
||||||
layoutType.definition.initialize(newLayoutObject);
|
|
||||||
newLayoutObject.composition = domainObject.composition;
|
|
||||||
newLayoutObject.configuration.layoutGrid = domainObject.layoutGrid || DEFAULT_GRID_SIZE;
|
|
||||||
|
|
||||||
let elements = domainObject.configuration['fixed-display'].elements;
|
|
||||||
let telemetryObjects = {};
|
|
||||||
let promises = elements.map(element => {
|
|
||||||
if (element.id) {
|
|
||||||
return openmct.objects.get(element.id)
|
|
||||||
.then(object => {
|
|
||||||
telemetryObjects[element.id] = object;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return Promise.all(promises)
|
|
||||||
.then(function () {
|
|
||||||
newLayoutObject.configuration.items =
|
|
||||||
migrateFixedPositionConfiguration(elements, telemetryObjects);
|
|
||||||
return newLayoutObject;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
];
|
|
||||||
|
function isTelemetry(domainObject) {
|
||||||
|
if (openmct.telemetry.isTelemetryObject(domainObject)
|
||||||
|
&& domainObject.type !== 'summary-widget'
|
||||||
|
&& domainObject.type !== 'example.imagery') {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function migrateDisplayLayout(domainObject, childObjects) {
|
||||||
|
const DEFAULT_GRID_SIZE = [32, 32];
|
||||||
|
let migratedObject = Object.assign({}, domainObject);
|
||||||
|
let panels = migratedObject.configuration.layout.panels;
|
||||||
|
let items = [];
|
||||||
|
|
||||||
|
Object.keys(panels).forEach(key => {
|
||||||
|
let panel = panels[key];
|
||||||
|
let domainObject = childObjects[key];
|
||||||
|
|
||||||
|
if (isTelemetry(domainObject)) {
|
||||||
|
items.push({
|
||||||
|
width: panel.dimensions[0],
|
||||||
|
height: panel.dimensions[1],
|
||||||
|
x: panel.position[0],
|
||||||
|
y: panel.position[1],
|
||||||
|
useGrid: true,
|
||||||
|
identifier: domainObject.identifier,
|
||||||
|
id: uuid(),
|
||||||
|
type: 'telemetry-view',
|
||||||
|
displayMode: 'all',
|
||||||
|
value: openmct.telemetry.getMetadata(domainObject).getDefaultDisplayValue(),
|
||||||
|
stroke: "transparent",
|
||||||
|
fill: "",
|
||||||
|
color: "",
|
||||||
|
size: "13px"
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
items.push({
|
||||||
|
width: panel.dimensions[0],
|
||||||
|
height: panel.dimensions[1],
|
||||||
|
x: panel.position[0],
|
||||||
|
y: panel.position[1],
|
||||||
|
useGrid: true,
|
||||||
|
identifier: domainObject.identifier,
|
||||||
|
id: uuid(),
|
||||||
|
type: 'subobject-view',
|
||||||
|
hasFrame: panel.hasFrame
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
migratedObject.configuration.items = items;
|
||||||
|
migratedObject.configuration.layoutGrid = migratedObject.layoutGrid || DEFAULT_GRID_SIZE;
|
||||||
|
delete migratedObject.layoutGrid;
|
||||||
|
delete migratedObject.configuration.layout;
|
||||||
|
return migratedObject;
|
||||||
|
}
|
||||||
|
|
||||||
|
function migrateFixedPositionConfiguration(elements, telemetryObjects) {
|
||||||
|
const DEFAULT_STROKE = "transparent";
|
||||||
|
const DEFAULT_SIZE = "13px";
|
||||||
|
const DEFAULT_COLOR = "";
|
||||||
|
const DEFAULT_FILL = "";
|
||||||
|
let items = [];
|
||||||
|
|
||||||
|
elements.forEach(element => {
|
||||||
|
let item = {
|
||||||
|
x: element.x,
|
||||||
|
y: element.y,
|
||||||
|
width: element.width,
|
||||||
|
height: element.height,
|
||||||
|
useGrid: element.useGrid,
|
||||||
|
id: uuid()
|
||||||
|
};
|
||||||
|
|
||||||
|
if (element.type === "fixed.telemetry") {
|
||||||
|
item.type = "telemetry-view";
|
||||||
|
item.stroke = element.stroke || DEFAULT_STROKE;
|
||||||
|
item.fill = element.fill || DEFAULT_FILL;
|
||||||
|
item.color = element.color || DEFAULT_COLOR;
|
||||||
|
item.size = element.size || DEFAULT_SIZE;
|
||||||
|
item.identifier = telemetryObjects[element.id].identifier;
|
||||||
|
item.displayMode = element.titled ? 'all' : 'value';
|
||||||
|
item.value = openmct.telemetry.getMetadata(telemetryObjects[element.id]).getDefaultDisplayValue();
|
||||||
|
} else if (element.type === 'fixed.box') {
|
||||||
|
item.type = "box-view";
|
||||||
|
item.stroke = element.stroke || DEFAULT_STROKE;
|
||||||
|
item.fill = element.fill || DEFAULT_FILL;
|
||||||
|
} else if (element.type === 'fixed.line') {
|
||||||
|
item.type = "line-view";
|
||||||
|
item.x2 = element.x2;
|
||||||
|
item.y2 = element.y2;
|
||||||
|
item.stroke = element.stroke || DEFAULT_STROKE;
|
||||||
|
delete item.height;
|
||||||
|
delete item.width;
|
||||||
|
} else if (element.type === 'fixed.text') {
|
||||||
|
item.type = "text-view";
|
||||||
|
item.text = element.text;
|
||||||
|
item.stroke = element.stroke || DEFAULT_STROKE;
|
||||||
|
item.fill = element.fill || DEFAULT_FILL;
|
||||||
|
item.color = element.color || DEFAULT_COLOR;
|
||||||
|
item.size = element.size || DEFAULT_SIZE;
|
||||||
|
} else if (element.type === 'fixed.image') {
|
||||||
|
item.type = "image-view";
|
||||||
|
item.url =element.url;
|
||||||
|
item.stroke = element.stroke || DEFAULT_STROKE;
|
||||||
|
}
|
||||||
|
|
||||||
|
items.push(item);
|
||||||
|
});
|
||||||
|
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
check(domainObject) {
|
||||||
|
return domainObject.type === 'layout' && domainObject.configuration.layout;
|
||||||
|
},
|
||||||
|
migrate(domainObject) {
|
||||||
|
let childObjects = {};
|
||||||
|
let promises = Object.keys(domainObject.configuration.layout.panels).map(key => {
|
||||||
|
return openmct.objects.get(key)
|
||||||
|
.then(object => {
|
||||||
|
childObjects[key] = object;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return Promise.all(promises)
|
||||||
|
.then(function () {
|
||||||
|
return migrateDisplayLayout(domainObject, childObjects);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
check(domainObject) {
|
||||||
|
return domainObject.type === 'telemetry.fixed' && domainObject.configuration['fixed-display'];
|
||||||
|
},
|
||||||
|
migrate(domainObject) {
|
||||||
|
const DEFAULT_GRID_SIZE = [64, 16];
|
||||||
|
let newLayoutObject = {
|
||||||
|
identifier: domainObject.identifier,
|
||||||
|
location: domainObject.location,
|
||||||
|
name: domainObject.name,
|
||||||
|
type: "layout"
|
||||||
|
};
|
||||||
|
let layoutType = openmct.types.get('layout');
|
||||||
|
layoutType.definition.initialize(newLayoutObject);
|
||||||
|
newLayoutObject.composition = domainObject.composition;
|
||||||
|
newLayoutObject.configuration.layoutGrid = domainObject.layoutGrid || DEFAULT_GRID_SIZE;
|
||||||
|
|
||||||
|
let elements = domainObject.configuration['fixed-display'].elements;
|
||||||
|
let telemetryObjects = {};
|
||||||
|
let promises = elements.map(element => {
|
||||||
|
if (element.id) {
|
||||||
|
return openmct.objects.get(element.id)
|
||||||
|
.then(object => {
|
||||||
|
telemetryObjects[element.id] = object;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return Promise.all(promises)
|
||||||
|
.then(function () {
|
||||||
|
newLayoutObject.configuration.items =
|
||||||
|
migrateFixedPositionConfiguration(elements, telemetryObjects);
|
||||||
|
return newLayoutObject;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
check(domainObject) {
|
||||||
|
return domainObject.type === 'table' &&
|
||||||
|
domainObject.configuration.table;
|
||||||
|
},
|
||||||
|
migrate(domainObject) {
|
||||||
|
let currentTableConfiguration = domainObject.configuration.table || {};
|
||||||
|
let currentColumnConfiguration = currentTableConfiguration.columns || {};
|
||||||
|
return getColumnNameKeyMap(domainObject).then(nameKeyMap => {
|
||||||
|
let hiddenColumns = Object.keys(currentColumnConfiguration).filter(columnName => {
|
||||||
|
return currentColumnConfiguration[columnName] === false;
|
||||||
|
}).reduce((hiddenColumnsMap, hiddenColumnName) => {
|
||||||
|
let key = nameKeyMap[hiddenColumnName];
|
||||||
|
hiddenColumnsMap[key] = true;
|
||||||
|
return hiddenColumnsMap;
|
||||||
|
}, {});
|
||||||
|
|
||||||
|
domainObject.configuration.hiddenColumns = hiddenColumns;
|
||||||
|
delete domainObject.configuration.table;
|
||||||
|
return domainObject;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -20,19 +20,21 @@
|
|||||||
* at runtime from the About dialog for additional information.
|
* at runtime from the About dialog for additional information.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
import migrations from './Migrations.js'
|
import Migrations from './Migrations.js'
|
||||||
|
|
||||||
export default function () {
|
export default function () {
|
||||||
function needsMigration(domainObject) {
|
|
||||||
return migrations.some(m => m.check(domainObject));
|
|
||||||
}
|
|
||||||
|
|
||||||
function migrateObject(domainObject) {
|
|
||||||
return migrations.filter(m => m.check(domainObject))[0]
|
|
||||||
.migrate(domainObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
return function (openmct) {
|
return function (openmct) {
|
||||||
|
let migrations = Migrations(openmct);
|
||||||
|
|
||||||
|
function needsMigration(domainObject) {
|
||||||
|
return migrations.some(m => m.check(domainObject));
|
||||||
|
}
|
||||||
|
|
||||||
|
function migrateObject(domainObject) {
|
||||||
|
return migrations.filter(m => m.check(domainObject))[0]
|
||||||
|
.migrate(domainObject);
|
||||||
|
}
|
||||||
|
|
||||||
let wrappedFunction = openmct.objects.get;
|
let wrappedFunction = openmct.objects.get;
|
||||||
openmct.objects.get = function migrate(identifier) {
|
openmct.objects.get = function migrate(identifier) {
|
||||||
return wrappedFunction.apply(openmct.objects, [identifier])
|
return wrappedFunction.apply(openmct.objects, [identifier])
|
||||||
@ -46,6 +48,6 @@ export default function () {
|
|||||||
}
|
}
|
||||||
return object;
|
return object;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user