Commit 73c37b98 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Evita uso de schemas locales de edición de capas 

Permite a los steps del módulo Wizard pedir y escuchar subschemas del
presente en el modelo principal de edición.

Refactoriza ligeramente la definición de step y elimina los schemas
locales usados.
parent 3785bf46

public/javascript/app/components/steps/DownloadsSetStep.js

+21 −4
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ define([ 
	, 'app/components/steps/_RememberDeleteItems'

	, 'app/designs/formList/layout/Layout'

	, 'app/designs/formList/main/FormListByStep'

	, 'app/maintenance/models/DownloadsServiceOGCModel'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'templates/DownloadsSet'
@@ -12,7 +11,6 @@ define([ 
	, _RememberDeleteItems

	, Layout

	, Controller

	, modelSchema

	, declare

	, lang

	, TemplateList
@@ -29,6 +27,7 @@ define([ 
				title: this.i18n.downloadsAssociated,



				propToRead: 'downloads',

				_createFormInitial: false,



				ownChannel: 'downloadsSetStep'

			};
@@ -43,11 +42,29 @@ define([ 
					template: TemplateList

				}

			}, this.browserConfig || {}]);

		},



		postCreate: function() {



			this.inherited(arguments);



			this._emitEvt('GET_PROPERTY_SCHEMA', {

				key: this.propToRead + '/{i}'

			});

		},



		_onGotPropertySchema: function(subSchema) {



			this.formConfig = this._merge([{

				modelSchema: modelSchema,

				modelSchema: subSchema,

				template: 'maintenance/views/templates/forms/Downloads'

			}, this.formConfig || {}]);



			this._createForm();



			this._emitEvt('SHOW_FORM', {

				node: this.formNode

			});

		}

	});

});

public/javascript/app/components/steps/ProtocolsSetStep.js

+33 −15
Original line number Diff line number Diff line 
define([

	"app/base/views/extensions/_EditionFormList"

	, "app/components/steps/_RememberDeleteItems"

	, "app/designs/formList/layout/Layout"

	, "app/designs/formList/main/FormListByStep"

	, "app/maintenance/models/ProtocolsServiceOGCModel"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "templates/ProtocolsSet"

	'app/base/views/extensions/_EditionFormList'

	, 'app/components/steps/_RememberDeleteItems'

	, 'app/designs/formList/layout/Layout'

	, 'app/designs/formList/main/FormListByStep'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'templates/ProtocolsSet'

], function (

	_EditionFormList

	, _RememberDeleteItems

	, Layout

	, Controller

	, modelSchema

	, declare

	, lang

	, TemplateList

) {



	return declare([Layout, Controller, _EditionFormList, _RememberDeleteItems], {

		//	summary:

		//		Step de ServiceOGC.
@@ -29,9 +28,10 @@ define([ 
				title: this.i18n.protocolsAssociated,



				// General params

				propToRead: "protocols",

				propToRead: 'protocols',

				_createFormInitial: false,



				ownChannel: "protocolsSetStep"

				ownChannel: 'protocolsSetStep'

			};



			lang.mixin(this, this.config, args);
@@ -44,11 +44,29 @@ define([ 
					template: TemplateList

				}

			}, this.browserConfig || {}]);

		},



		postCreate: function() {



			this.inherited(arguments);



			this._emitEvt('GET_PROPERTY_SCHEMA', {

				key: this.propToRead + '/{i}'

			});

		},



		_onGotPropertySchema: function(subSchema) {



			this.formConfig = this._merge([{

				modelSchema: modelSchema,

				template: "maintenance/views/templates/forms/Protocols"

				modelSchema: subSchema,

				template: 'maintenance/views/templates/forms/Protocols'

			}, this.formConfig || {}]);



			this._createForm();



			this._emitEvt('SHOW_FORM', {

				node: this.formNode

			});

		}

	});

});

public/javascript/app/maintenance/models/DownloadsServiceOGCModel.js

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
define([], function() {



	return {

		"$schema": "http://json-schema.org/schema#",

		title: "DownloadsServiceOGC schema",

		type: "object",

		required: ["name", "url"],

		properties: {

			id: {

				type: ["integer", "null"]

			},

			name: {

				type: "string"

			},

			url: {

				type: ["string", "null"],

				format: "url"

			}

		}

	};

});

public/javascript/app/maintenance/models/ProtocolsServiceOGCModel.js

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
define([

	"app/redmicConfig"

], function (

	redmicConfig

){

	return {

		"$schema": "http://json-schema.org/schema#",

		title: "ProtocolsServiceOGC schema",

		type: "object",

		required: ["type", "url"],

		properties: {

			id: {

				type: ["integer", "null"]

			},

			type: {

				type: "string"

			},

			url: {

				type: ["string", "null"],

				format: "url"

			}

		}

	};

});
 
 No newline at end of file

public/javascript/redmic/modules/layout/wizard/_WizardStep.js

+94 −43
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ define([ 
	, ModelImpl

	, _WizardStepItfc

) {



	return declare(_WizardStepItfc, {

		//	summary:

		//		Extensión para los módulos usados como Step dentro de un Wizard.
@@ -26,12 +27,16 @@ define([ 
			DELETE_VALUE: "deleteValue",

			ADD_VALUE: "addValue",

			FLUSH: "flush",

			IS_VALID: 'isValid',

			GO_FORWARD: "goForward",

			GET_ID_PROPERTY: "getIdProperty",

			STEP_SHOWN: "stepShown",

			GOT_NEXT_STEP: "gotNextStep",

			GOT_PREV_STEP: "gotPrevStep",

			BEFORE_GOING_NEXT_STEP_DONE: "beforeGoingNextStepDone"

			BEFORE_GOING_NEXT_STEP_DONE: "beforeGoingNextStepDone",

			MODEL_RESET: 'modelReset',

			MODEL_CLEAR: 'modelClear',

			GET_PROPERTY_SCHEMA: 'getPropertySchema'

		},



		wizardStepActions: {
@@ -65,7 +70,11 @@ define([ 
			REFRESH_TRACE: "refreshTrace",

			RESET: "reset",

			CLEAR: "clear",

			VALUE_CHANGED: "valueChanged"

			VALUE_CHANGED: "valueChanged",

			MODEL_RESET: 'modelReset',

			MODEL_CLEAR: 'modelClear',

			GET_PROPERTY_SCHEMA: 'getPropertySchema',

			GOT_PROPERTY_SCHEMA: 'gotPropertySchema'

		},



		constructor: function(args) {
@@ -79,7 +88,6 @@ define([ 
			}



			aspect.after(this, "_mixEventsAndActions", lang.hitch(this, this._mixWizardStepEventsAndActions));

			aspect.after(this, "_setOwnCallbacksForEvents", lang.hitch(this, this._setWizardStepOwnCallbacksForEvents));

			aspect.before(this, "_defineSubscriptions", lang.hitch(this, this._defineWizardStepSubscriptions));

			aspect.before(this, "_definePublications", lang.hitch(this, this._defineWizardStepPublications));

			aspect.before(this, "_initialize", lang.hitch(this, this._initializeWizardStep));
@@ -93,17 +101,12 @@ define([ 
			delete this.wizardStepActions;

		},



		_setWizardStepOwnCallbacksForEvents: function() {



		},



		_initializeWizardStep: function() {



			if (this.modelChannel) {

				this._setModelChannel(this.modelChannel);

				this._setGlobalModelUsed(true);

			} else if (this.modelTarget || this.modelSchema) {



				this.modelConfig = this._merge([{

					schema: this.modelSchema,

					target: this.modelTarget
@@ -239,6 +242,12 @@ define([ 
				options: {

					predicate: lang.hitch(this, this._chkGotIdProperty)

				}

			},{

				channel : this._buildChannel(this.modelChannel, this.actions.GOT_PROPERTY_SCHEMA),

				callback: '_subGotPropertySchema',

				options: {

					predicate: lang.hitch(this, this._chkGotPropertySchema)

				}

			}]);

		},
@@ -259,6 +268,18 @@ define([ 
			},{

				event: 'GET_ID_PROPERTY',

				channel: this._buildChannel(this.modelChannel, this.actions.GET_ID_PROPERTY)

			},{

				event: 'IS_VALID',

				channel: this._buildChannel(this.modelChannel, this.actions.IS_VALID)

			},{

				event: 'MODEL_RESET',

				channel: this._buildChannel(this.modelChannel, this.actions.MODEL_RESET)

			},{

				event: 'MODEL_CLEAR',

				channel: this._buildChannel(this.modelChannel, this.actions.MODEL_CLEAR)

			},{

				event: 'GET_PROPERTY_SCHEMA',

				channel: this._buildChannel(this.modelChannel, this.actions.GET_PROPERTY_SCHEMA)

			}]);

		},
@@ -275,13 +296,11 @@ define([ 
			dfd.then(lang.hitch(this, this._emitEvt, "BEFORE_GOING_NEXT_STEP_DONE"));



			if (this._beforeGoingNextStepDfd) {



				console.error("Tried to do actions before going to next step twice, in '%s' step, at module '%s'",

					this.stepId, this.getChannel());



				dfd.reject();

			} else {



				this._beforeGoingNextStepDfd = dfd;

				this._beforeGoingNextStep();

			}
@@ -327,7 +346,6 @@ define([ 
				};



			if (success) {



				pubObj.stepId = this.stepId;



				this._once(this.getChannel('SHOWN'), lang.hitch(this, this._emitEvt, 'STEP_SHOWN', pubObj));
@@ -337,12 +355,9 @@ define([ 
					data: data

				});

			} else {



				if (direction === "n") {



					pubObj.stepId = this._getNextStepId(this.stepId, this._getWizardResults());

				} else if (direction === "p") {



					pubObj.stepId = this._getPrevStepId(this.stepId, this._getWizardResults());

				}
@@ -370,11 +385,12 @@ define([ 
			var isDfd = stepId && !!stepId.then;



			if (isDfd) {

				stepId.then(lang.hitch(this, function(evtName, stepIdResolved) {

					this._emitEvt(evtName, { stepId: stepIdResolved });

				stepId.then(lang.hitch(this, function(evt, stepIdResolved) {

					this._emitEvt(evt, { stepId: stepIdResolved });

				}, evtName));

			} else

			} else {

				this._emitEvt(evtName, { stepId: stepId });

			}

		},



		_subRefreshTrace: function(res) {
@@ -440,22 +456,42 @@ define([ 
		_pubNewStatus: function(channel, req) {



			if (this.propertyName && this.modelChannel && this._isValidProperty === undefined) {

				this._publish(this._buildChannel(this.modelChannel, this.actions.IS_VALID));

				this._emitEvt('IS_VALID');

				return;

			}



			var status = (req && req.status) ? req.status : (!(this.propertyName && this.modelChannel) ||

				this._isValidProperty) && this.isStepCompleted(this._wizardResults, this.skippable),

			var step, status, results;



				obj = {

					step: (req && req.stepId) ? req.stepId : this.stepId,

					status: status,

					results: (req && req.results) ? req.results : (status ? this.getStepResults() : null)

				};

			if (!req) {

				req = {};

			}



			if (req.stepId) {

				step = req.stepId;

			} else {

				step = this.stepId;

			}



			if (req.status) {

				status = req.status;

			} else {

				status = (!(this.propertyName && this.modelChannel) ||

				this._isValidProperty) && this.isStepCompleted(this._wizardResults, this.skippable);

			}



			if (req.results) {

				results = req.results;

			} else {

				results = status ? this.getStepResults() : null;

			}



			this.statusStep = status;



			this._publish(channel, obj);

			this._publish(channel, {

				step: step,

				status: status,

				results: results

			});

		},



		isStepCompleted: function(results, skippable) {
@@ -478,6 +514,17 @@ define([ 
			return req.property === this.propToRead;

		},



		_chkGotPropertySchema: function(res) {



			var propName = res.propertyName;



			if (!propName || !this.propToRead) {

				return false;

			}



			return propName === this.propToRead || propName.indexOf(this.propToRead) === 0;

		},



		_containedPropertyIsMine: function(obj) {



			return obj[this.propertyName] !== undefined;
@@ -488,19 +535,22 @@ define([ 
			this._gotIdProperty(req.value);

		},



		_subGotPropertySchema: function(res) {



			this._onGotPropertySchema(res.schema);

		},



		_getNextStepId: function() {



			if (this.getNextStepId) {

				if (typeof this.getNextStepId === "string") {



					return this.getNextStepId;

				} else {



					return this.getNextStepId(arguments);

				}

			}



			var id = parseInt(this.stepId, 10);

			var id = parseInt(this.stepId, 10),

				nextStepId = id + 1;



			return nextStepId.toString();
@@ -511,7 +561,6 @@ define([ 
			var ret;



			if (this._wizardStepsTrace) {



				var pos = this._wizardStepsTrace.indexOf(this.stepId);

				if (pos > 0) {

					ret = this._wizardStepsTrace[pos - 1];
@@ -536,12 +585,13 @@ define([ 


		_internalResetStep: function() {



			if (this.modelChannel && this.propertyName) {

			if (!this.propertyName) {

				return;

			}



				this._publish(this._buildChannel(this.modelChannel, this.actions.RESET), {

			this._emitEvt('MODEL_RESET', {

				properties: [this.propertyName]

			});

			}

		},



		_subClear: function() {
@@ -562,12 +612,13 @@ define([ 
			this._isCompleted = false;

			this._results = null;



			if (this.modelChannel && this.propertyName) {

			if (!this.propertyName) {

				return;

			}



				this._publish(this._buildChannel(this.modelChannel, this.actions.CLEAR), {

			this._emitEvt('MODEL_CLEAR', {

				properties: [this.propertyName]

			});

		}

		}

	});

});