diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js b/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js
index f68a36d9f1af6cf5adc56983879dfc6ca7a87f5d..7581c8e1765f6c365eda45cfcd79681a9cfbede4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js
@@ -132,9 +132,9 @@ function Jeditor(props) {
}
}
}
-
// Customize datatype of certain properties like subbands, duration, etc.,
getCustomProperties(schema.properties);
+ getCustomProperties(schema.definitions);
schema.title = props.title;
const subbandValidator = validateSubbandOutput;
const timeValidator = validateTime;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js
index 2842a5e2d6073cdac6d5c2f6aba78d51aec7d310..c65037fe89db53064327957d6a4ec4e4925710a2 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js
@@ -94,7 +94,7 @@ export default (props) => {
...stationState,
[StationName]: {
stations: response.stations,
- missing_StationFields: missing_StationFields ? isNaN(missing_StationFields.max_nr_missing)? 0: missing_StationFields.max_nr_missing : '0'
+ missing_StationFields: missing_StationFields ? isNaN(missing_StationFields.max_nr_missing)? 0: missing_StationFields.max_nr_missing : ''
},
Custom: {
stations: [...stationState['Custom'].stations, ...response.stations],
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
index cf5baa7e9a48890f47a9cbda3e4feced52f9af6f..1d6bde8f6fb982ed632df8366efc14a7a807496a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
@@ -22,6 +22,7 @@ import SchedulingConstraint from './Scheduling.Constraints';
import Stations from './Stations';
import { CustomDialog } from '../../layout/components/CustomDialog';
import SchedulingSet from './schedulingset.create';
+import UtilService from '../../services/util.service';
/**
* Component to create a new SchedulingUnit from Observation strategy template
@@ -122,6 +123,7 @@ export class SchedulingUnitCreate extends Component {
const projectSchedSets = _.filter(this.schedulingSets, {'project_id': projectName});
let schedulingUnit = this.state.schedulingUnit;
schedulingUnit.project = projectName;
+ schedulingUnit.scheduling_set_id = null;
const selectedProject = _.filter(this.projects, {'name': projectName});
this.setState({selectedProject: selectedProject, schedulingUnit: schedulingUnit, schedulingSets: projectSchedSets, validForm: this.validateForm('project'), isDirty: true});
}
@@ -140,6 +142,7 @@ export class SchedulingUnitCreate extends Component {
properties: {}, definitions:{}
};
+ // TODo: This schema reference resolving code has to be moved to common file and needs to rework
for (const taskName of _.keys(tasks)) {
const task = tasks[taskName];
//Resolve task from the strategy template
@@ -168,7 +171,16 @@ export class SchedulingUnitCreate extends Component {
} catch(error) {
tempProperty = _.cloneDeep(taskTemplate.schema.properties[taskPaths[4]]);
- if (tempProperty.type === 'array') {
+ if (tempProperty['$ref']) {
+ tempProperty = await UtilService.resolveSchema(tempProperty);
+ if (tempProperty.definitions && tempProperty.definitions[taskPaths[4]]) {
+ schema.definitions = {...schema.definitions, ...tempProperty.definitions};
+ tempProperty = tempProperty.definitions[taskPaths[4]];
+ } else if (tempProperty.properties && tempProperty.properties[taskPaths[4]]) {
+ tempProperty = tempProperty.properties[taskPaths[4]];
+ }
+ }
+ if (tempProperty.type === 'array' && taskPaths.length>6) {
tempProperty = tempProperty.items.properties[taskPaths[6]];
}
property = tempProperty;
@@ -223,8 +235,6 @@ export class SchedulingUnitCreate extends Component {
} else {
this.setState({ constraintParamsOutput: jsonOutput, constraintValidEditor: err.length === 0, validForm: this.validateForm()});
}
-
-
}
/**
@@ -239,7 +249,7 @@ export class SchedulingUnitCreate extends Component {
* @param {string} key
* @param {object} value
*/
- setSchedUnitParams(key, value) {
+ async setSchedUnitParams(key, value) {
this.setState({
touched: {
...this.state.touched,
@@ -249,9 +259,11 @@ export class SchedulingUnitCreate extends Component {
let schedulingUnit = _.cloneDeep(this.state.schedulingUnit);
schedulingUnit[key] = value;
if ( !this.state.isDirty && !_.isEqual(this.state.schedulingUnit, schedulingUnit) ) {
- this.setState({schedulingUnit: schedulingUnit, validForm: this.validateForm(key), validEditor: this.validateEditor(), isDirty: true});
+ await this.setState({schedulingUnit: schedulingUnit});
+ this.setState({validForm: this.validateForm(key), validEditor: this.validateEditor(), isDirty: true});
} else {
- this.setState({schedulingUnit: schedulingUnit, validForm: this.validateForm(key), validEditor: this.validateEditor()});
+ await this.setState({schedulingUnit: schedulingUnit});
+ this.setState({validForm: this.validateForm(key), validEditor: this.validateEditor()});
}
this.validateEditor();
}
@@ -547,23 +559,25 @@ export class SchedulingUnitCreate extends Component {
</div>
<div className="col-lg-1 col-md-1 col-sm-12"></div>
<label htmlFor="schedSet" className="col-lg-2 col-md-2 col-sm-12">Scheduling Set <span style={{color:'red'}}>*</span></label>
- <div className="col-lg-3 col-md-3 col-sm-12">
+ <div className="col-lg-3 col-md-3 col-sm-10">
<Dropdown data-testid="schedSet" id="schedSet" optionLabel="name" optionValue="id"
tooltip="Scheduling set of the project" tooltipOptions={this.tooltipOptions}
value={this.state.schedulingUnit.scheduling_set_id}
options={this.state.schedulingSets}
onChange={(e) => {this.setSchedUnitParams('scheduling_set_id',e.value)}}
placeholder="Select Scheduling Set" />
-
- <Button label="" className="p-button-primary" icon="pi pi-plus"
+ <label className={(this.state.errors.scheduling_set_id && this.state.touched.scheduling_set_id) ?"error":"info"}>
+ {(this.state.errors.scheduling_set_id && this.state.touched.scheduling_set_id) ? this.state.errors.scheduling_set_id : "Scheduling Set of the Project"}
+ </label>
+ </div>
+ <div className="col-lg-1 col-md-1 col-sm-2">
+ <Button label="" className="p-button-primary" icon="pi pi-plus"
onClick={() => {this.setState({showAddSet: true})}}
tooltip="Add new Scheduling Set"
- style={{bottom: '2em', left: '25em'}}
+ style={{marginLeft: '-10px'}}
disabled={this.state.schedulingUnit.project !== null ? false : true }/>
- <label className={(this.state.errors.scheduling_set_id && this.state.touched.scheduling_set_id) ?"error":"info"}>
- {(this.state.errors.scheduling_set_id && this.state.touched.scheduling_set_id) ? this.state.errors.scheduling_set_id : "Scheduling Set of the Project"}
- </label>
+
</div>
</div>
<div className="p-field p-grid">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
index 31ebfe2212d988a6dff2dcf697f210659fb649de..25e99b3fa212c283946e6ddabeeab272d071051e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
@@ -21,6 +21,7 @@ import ScheduleService from '../../services/schedule.service';
import TaskService from '../../services/task.service';
import UIConstants from '../../utils/ui.constants';
import SchedulingConstraint from './Scheduling.Constraints';
+import UtilService from '../../services/util.service';
/**
* Compoenent to edit scheduling unit draft
@@ -90,6 +91,7 @@ export class EditSchedulingUnit extends Component {
let schema = { type: 'object', additionalProperties: false,
properties: {}, definitions:{}
};
+ // TODo: This schema reference resolving code has to be moved to common file and needs to rework
for (const taskName in tasks) {
const task = tasks[taskName];
const taskDraft = this.state.taskDrafts.find(taskD => taskD.name === taskName);
@@ -118,7 +120,16 @@ export class EditSchedulingUnit extends Component {
tempProperty = $templateRefs.get(parameterRef);
} catch(error) {
tempProperty = _.cloneDeep(taskTemplate.schema.properties[taskPaths[4]]);
- if (tempProperty.type === 'array') {
+ if (tempProperty['$ref']) {
+ tempProperty = await UtilService.resolveSchema(tempProperty);
+ if (tempProperty.definitions && tempProperty.definitions[taskPaths[4]]) {
+ schema.definitions = {...schema.definitions, ...tempProperty.definitions};
+ tempProperty = tempProperty.definitions[taskPaths[4]];
+ } else if (tempProperty.properties && tempProperty.properties[taskPaths[4]]) {
+ tempProperty = tempProperty.properties[taskPaths[4]];
+ }
+ }
+ if (tempProperty.type === 'array' && taskPaths.length>6) {
tempProperty = tempProperty.items.properties[taskPaths[6]];
}
property = tempProperty;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
index 50604d2f6a55d2380c631c2925bee815e9806c6a..161657340ba91b073e152f4afd04f45212a892de 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
@@ -35,6 +35,7 @@ import 'ag-grid-community/dist/styles/ag-grid.css';
import 'ag-grid-community/dist/styles/ag-theme-alpine.css';
import { CustomPageSpinner } from '../../components/CustomPageSpinner';
import { CustomDialog } from '../../layout/components/CustomDialog';
+import UtilService from '../../services/util.service';
// const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
const BG_COLOR = '#f878788f';
@@ -848,6 +849,7 @@ export class SchedulingSetCreate extends Component {
properties: {}, definitions:{}
};
let paramsOutput = {};
+ // TODo: This schema reference resolving code has to be moved to common file and needs to rework
for (const taskName in tasks) {
const task = tasks[taskName];
if (task['specifications_template'] === 'target observation') {
@@ -871,7 +873,16 @@ export class SchedulingSetCreate extends Component {
tempProperty = $templateRefs.get(parameterRef);
} catch(error) {
tempProperty = _.cloneDeep(taskTemplate.schema.properties[taskPaths[4]]);
- if (tempProperty.type === 'array') {
+ if (tempProperty['$ref']) {
+ tempProperty = await UtilService.resolveSchema(tempProperty);
+ if (tempProperty.definitions && tempProperty.definitions[taskPaths[4]]) {
+ schema.definitions = {...schema.definitions, ...tempProperty.definitions};
+ tempProperty = tempProperty.definitions[taskPaths[4]];
+ } else if (tempProperty.properties && tempProperty.properties[taskPaths[4]]) {
+ tempProperty = tempProperty.properties[taskPaths[4]];
+ }
+ }
+ if (tempProperty.type === 'array' && taskPaths.length>6) {
tempProperty = tempProperty.items.properties[taskPaths[6]];
}
property = tempProperty;
@@ -916,7 +927,7 @@ export class SchedulingSetCreate extends Component {
}
//Resolve task from the strategy template
const $taskRefs = await $RefParser.resolve(task);
-
+ // TODo: This schema reference resolving code has to be moved to common file and needs to rework
// Identify the task specification template of every task in the strategy template
const taskTemplate = _.find(this.taskTemplates, {'name': task['specifications_template']});
schema['$id'] = taskTemplate.schema['$id'];
@@ -936,7 +947,16 @@ export class SchedulingSetCreate extends Component {
tempProperty = $templateRefs.get(parameterRef);
} catch(error) {
tempProperty = _.cloneDeep(taskTemplate.schema.properties[taskPaths[4]]);
- if (tempProperty.type === 'array') {
+ if (tempProperty['$ref']) {
+ tempProperty = await UtilService.resolveSchema(tempProperty);
+ if (tempProperty.definitions && tempProperty.definitions[taskPaths[4]]) {
+ schema.definitions = {...schema.definitions, ...tempProperty.definitions};
+ tempProperty = tempProperty.definitions[taskPaths[4]];
+ } else if (tempProperty.properties && tempProperty.properties[taskPaths[4]]) {
+ tempProperty = tempProperty.properties[taskPaths[4]];
+ }
+ }
+ if (tempProperty.type === 'array' && taskPaths.length>6) {
tempProperty = tempProperty.items.properties[taskPaths[6]];
}
property = tempProperty;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
index 8969240a2b841aec627bc2ca56f32f4563dead07..d46b2fba3e90b785a60bf6f1f95e9ac0edc0dc74 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
@@ -1,3 +1,5 @@
+import $RefParser from "@apidevtools/json-schema-ref-parser";
+import _ from 'lodash';
const axios = require('axios');
/**
@@ -79,7 +81,74 @@ const UtilService = {
} catch(error) {
console.error(error);
}
- }
+ },
+ resolveSchema: async function(schema) {
+ let properties = schema.properties;
+ schema.definitions = schema.definitions?schema.definitions:{};
+ if (properties) {
+ for (const propertyKey in properties) {
+ let property = properties[propertyKey];
+ if (property["$ref"] && !property["$ref"].startsWith("#")) { // 1st level reference of the object
+ const refUrl = property["$ref"];
+ let newRef = refUrl.substring(refUrl.indexOf("#"));
+ let defKey = refUrl.substring(refUrl.lastIndexOf("/")+1);
+ schema.definitions[defKey] = (await $RefParser.resolve(refUrl)).get(newRef);
+ property["$ref"] = newRef;
+ if(schema.definitions[defKey].type && (schema.definitions[defKey].type === 'array'
+ || schema.definitions[defKey].type === 'object')){
+ let resolvedItems = await this.resolveSchema(schema.definitions[defKey]);
+ if (resolvedItems.items && resolvedItems.items['$ref'] && _.keys(resolvedItems.definitions).length===1) {
+ const resolvedRefKey = resolvedItems.items['$ref'];
+ resolvedItems.items = resolvedItems.definitions[resolvedRefKey.substring(resolvedRefKey.lastIndexOf("/")+1)];
+ } else {
+ schema.definitions = {...schema.definitions, ...resolvedItems.definitions};
+ }
+ delete resolvedItems['definitions'];
+ }
+ } else if(property["type"] === "array") { // reference in array items definition
+ let resolvedItems = await this.resolveSchema(property["items"]);
+ schema.definitions = {...schema.definitions, ...resolvedItems.definitions};
+ delete resolvedItems['definitions'];
+ property["items"] = resolvedItems;
+ } else if(property["type"] === "object" && property.properties) {
+ property = await this.resolveSchema(property);
+ schema.definitions = {...schema.definitions, ...property.definitions};
+ delete property['definitions'];
+ }
+ properties[propertyKey] = property;
+ }
+ } else if (schema["oneOf"] || schema["anyOf"]) { // Reference in OneOf/anyOf array
+ let defKey = schema["oneOf"]?"oneOf":"anyOf";
+ let resolvedOneOfList = []
+ for (const oneOfProperty of schema[defKey]) {
+ const resolvedOneOf = await this.resolveSchema(oneOfProperty);
+ resolvedOneOfList.push(resolvedOneOf);
+ if (resolvedOneOf.definitions) {
+ schema.definitions = {...schema.definitions, ...resolvedOneOf.definitions};
+ }
+ }
+ schema[defKey] = resolvedOneOfList;
+ } else if (schema["$ref"] && !schema["$ref"].startsWith("#")) { //reference in oneOf list item
+ const refUrl = schema["$ref"];
+ let newRef = refUrl.substring(refUrl.indexOf("#"));
+ let defKey = refUrl.substring(refUrl.lastIndexOf("/")+1);
+ schema.definitions[defKey] = (await $RefParser.resolve(refUrl)).get(newRef);
+ if (schema.definitions[defKey].properties || schema.definitions[defKey].type === "object"
+ || schema.definitions[defKey].type === "array") {
+ let property = await this.resolveSchema(schema.definitions[defKey]);
+ schema.definitions = {...schema.definitions, ...property.definitions};
+ delete property['definitions'];
+ schema.definitions[defKey] = property;
+ }
+ schema["$ref"] = newRef;
+ } else if(schema["type"] === "array") { // reference in array items definition
+ let resolvedItems = await this.resolveSchema(schema["items"]);
+ schema.definitions = {...schema.definitions, ...resolvedItems.definitions};
+ delete resolvedItems['definitions'];
+ schema["items"] = resolvedItems;
+ }
+ return schema;
+ }
}
export default UtilService;
\ No newline at end of file