Commit e2e1e68a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Aplica ajustes de sintaxis y comprobaciones

parent f58a7632
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ define([

		_getTargetForGet: function(req, requesterChannel) {

			// TODO la propiedad 'id' desaparecerá, en su lugar se definirán todos los target por completo
			let target = this._getTargetWithPathParamsReplaced(req.target, requesterChannel);

			const id = req.id,
@@ -104,11 +105,12 @@ define([

		_getTargetForRequest: function(req, requesterChannel) {

			let target = this._getTargetWithPathParamsReplaced(req.target, requesterChannel);
			const target = this._getTargetWithPathParamsReplaced(req.target, requesterChannel);

			// TODO la propiedad 'action' desaparecerá, en su lugar se definirán todos los target por completo
			const action = req.action;
			if (action?.length) {
				target = this._getTargetWithEndingSlash(target) + action;
			if (action?.length && !target.includes(action)) {
				return this._getTargetWithEndingSlash(target) + action;
			}

			return target;
@@ -207,6 +209,7 @@ define([

		_getTargetForSave: function(req) {

			// TODO la propiedad 'idProperty' e 'id' desaparecerán, en su lugar se definirán todos los target por completo
			const idValue = this._getItemIdFromSaveRequest(req),
				idType = typeof idValue;

@@ -279,6 +282,7 @@ define([

		_getTargetForRemove: function(req) {

			// TODO la propiedad 'id' desaparecerá, en su lugar se definirán todos los target por completo
			const target = this._getTargetWithPathParamsReplaced(req.target),
				idValue = req.id;

+4 −4
Original line number Diff line number Diff line
define([
	'dojo/_base/declare'
	, 'src/component/layout/genericDisplayer/GenericDisplayer'
	, 'src/component/layout/SupersetDisplayer'
	, 'src/detail/activity/widget/ActivityAreaMap'
	, 'src/detail/activity/widget/ActivityCitationMap'
	, 'src/detail/activity/widget/ActivityFixedObservationSeriesList'
@@ -11,10 +13,10 @@ define([
	, 'src/detail/activity/widget/ActivityLayerMap'
	, 'src/detail/activity/widget/ActivityTrackingMap'
	, 'src/detail/project/widget/ProjectAcousticDetectionMap'
	, 'src/component/layout/genericDisplayer/GenericDisplayer'
	, 'src/component/layout/SupersetDisplayer'
], function(
	declare
	, GenericDisplayer
	, SupersetDisplayer
	, ActivityAreaMap
	, ActivityCitationMap
	, ActivityFixedObservationSeriesList
@@ -26,8 +28,6 @@ define([
	, ActivityLayerMap
	, ActivityTrackingMap
	, ProjectAcousticDetectionMap
	, GenericDisplayer
	, SupersetDisplayer
) {

	return declare(null, {
+3 −3
Original line number Diff line number Diff line
@@ -68,15 +68,15 @@ define([
			const dfd = new Deferred();

			dfd.then(
				(resolvedGrants) => this._onLayoutGranted(processedLayout, resolvedGrants),
				(rejectedGrants) => this._onLayoutNotGranted(processedLayout, rejectedGrants));
				resolvedGrants => this._onLayoutGranted(processedLayout, resolvedGrants),
				rejectedGrants => this._onLayoutNotGranted(processedLayout, rejectedGrants));

			this._checkUserGrantsForEntityData(entityData, layoutRoles, dfd);
		},

		_checkUserGrantsForEntityData: function(entityData, roles, dfd) {

			this._once(this._buildChannel(this.credentialsChannel, 'GOT_USER_GRANTS_FOR_ENTITY'), (res) => {
			this._once(this._buildChannel(this.credentialsChannel, 'GOT_USER_GRANTS_FOR_ENTITY'), res => {
				res?.accessGranted ? dfd.resolve(res) : dfd.reject(res);
			});

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ define([

		_highlightOnDesiredSuggestion: function(/*String*/ defaultSibling, /*String*/ desiredSibling) {

			if (!this._suggestionsContainer.hasChildNodes()) {
			if (!this._suggestionsContainer?.hasChildNodes()) {
				return;
			}

+1 −1

File changed.

Contains only whitespace changes.