Limpia y simplifica partes de código de browser (db6984b4) · Commits · REDMIC Project / Client / Web

client-app/src/component/browser/Browser.js

+20 −48

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ define([

		_subRefresh: function(res) {

		if (res && res.initData && this._initData) {
		if (res?.initData && this._initData) {
		this._dataAvailable(lang.clone(this._initData));
		}
		},
		@@ -253,7 +253,7 @@ define([

		_clearData: function() {

		for (var key in this._rows) {
		for (let key in this._rows) {
		this._removeRow(key);
		}
		},
		@@ -274,7 +274,7 @@ define([

		_removeData: function(ids) {

		for (var i = 0; i < ids.length; i++) {
		for (let i = 0; i < ids.length; i++) {
		this._removeItem(ids[i]);
		}
		},
		@@ -301,7 +301,7 @@ define([

		this._configRow(item);

		var RowDefinition = declare(this._defRow),
		const RowDefinition = declare(this._defRow),
		rowInstance = new RowDefinition(this.rowConfig);

		this._setRow(idProperty, {
		@@ -344,17 +344,11 @@ define([
		this.template = template;
		},

		getNodeToShow: function() {

		return this.domNode;
		},

		_getData: function() {

		var data = [];

		for (var key in this._rows) {
		let data = [];

		for (let key in this._rows) {
		data.push(this._getRowData(key));
		}

		@@ -385,11 +379,11 @@ define([
		return;
		}

		data = this._merge([this._rows[idProperty].data, data]);
		const mergedData = this._merge([this._rows[idProperty].data, data]);

		this._rows[idProperty].data = data;
		this._rows[idProperty].data = mergedData;

		return data;
		return mergedData;
		},

		_setRowInstance: function(idProperty, instance) {
		@@ -416,13 +410,9 @@ define([
		return;
		}

		var row = this._getRow(idProperty);
		const row = this._getRow(idProperty);

		if (!row) {
		return;
		}

		return row.data;
		return row?.data;
		},

		_getRowInstance: function(idProperty) {
		@@ -431,13 +421,9 @@ define([
		return;
		}

		var row = this._getRow(idProperty);

		if (!row) {
		return;
		}
		const row = this._getRow(idProperty);

		return row.instance;
		return row?.instance;
		},

		_getRowChannel: function(idProperty) {
		@@ -446,42 +432,28 @@ define([
		return;
		}

		var instance = this._getRowInstance(idProperty);

		if (!instance) {
		return;
		}
		const instance = this._getRowInstance(idProperty);

		return instance.getChannel();
		return instance?.getChannel();
		},

		_isIdProperty: function(idProperty) {

		if (idProperty === undefined \|\| idProperty === null) {
		return false;
		}

		return true;
		return idProperty !== undefined && idProperty !== null;
		},

		_parserIndexData: function(response) {

		var data = response.data;

		if (data.data) {
		data = data.data;
		}
		const data = response.data?.data \|\| response.data;

		return data;
		return data.content \|\| data;
		},

		_processNewData: function(response) {

		var data = this._parserIndexData(response);
		const data = this._parserIndexData(response);

		for (var i = 0; i < data.length; i++) {
		this._addItem(data[i]);
		}
		data?.forEach(dataItem => this._addItem(dataItem));
		}
		});
		});

client-app/src/component/browser/_DataTypeParser.js

+21 −36

Original line number	Diff line number	Diff line
		define([
		"dojo/_base/declare"
		, "dojo/_base/lang"
		, "dojo/aspect"
		'dojo/_base/declare'
		, 'dojo/_base/lang'
		], function(
		declare
		, lang
		, aspect
		) {

		return declare(null, {
		// summary:
		//
		// description:
		//

		constructor: function(args) {

		this.config = {
		// Amplía proceso de entrada de datos para el manejo de datos de recolección de basura.

		};
		_addData: function(response) {

		lang.mixin(this, this.config, args);
		},
		const clonedResponse = lang.clone(response);

		_dataAvailable: function(response) {

		if (!this._initData && this.initialDataSave) {
		this._initData = lang.clone(response);
		if (clonedResponse.data.features) {
		clonedResponse.data.data = clonedResponse.data.features;
		delete clonedResponse.data.features;
		}

		if (response.data.features) {
		response.data.data = response.data.features;
		delete response.data.features;
		}
		const data = response.data,
		newData = data[0];

		var data = response.data,
		newData = lang.clone(data[0]);
		if (!newData) {
		this.inherited(arguments);
		return;
		}

		for (var i = 1; i < data.length; i++) {
		for (let i = 1; i < data.length; i++) {
		data[i].data.splice(0,1);
		newData.data = this._merge([data[i].data, newData.data \|\| {}], {
		arrayMergingStrategy: 'combine'
		});
		}

		if (!newData) {
		return;
		}

		newData.total = newData.data.length;
		newData.total = newData.data?.length;

		newData = {
		data: newData
		};
		arguments[0] = {data: newData};

		this._addData(newData);
		this.inherited(arguments);
		}
		});
		});

client-app/src/component/browser/_DragAndDrop.js

+7 −3

Original line number	Diff line number	Diff line
		@@ -105,6 +105,10 @@ define([
		rowNodeToUpdate = this._getRowNodeFromRowId(rowId),
		oldIndex = Array.from(this.contentListNode.firstChild.children).indexOf(rowNodeToUpdate);

		if (!rowNodeAtNewIndex \|\| !rowNodeToUpdate) {
		return;
		}

		put(rowNodeAtNewIndex, '-', rowNodeToUpdate);

		this._emitEvt('DRAG_AND_DROP', {
		@@ -127,7 +131,7 @@ define([
		var rowId = req.id,
		dragHandlerNode = this._getDragHandlerNodeFromRowId(rowId);

		domClass.remove(dragHandlerNode, this.hiddenClass);
		dragHandlerNode && domClass.remove(dragHandlerNode, this.hiddenClass);
		},

		_subDisableDragAndDrop: function(req) {
		@@ -142,14 +146,14 @@ define([

		var rowInstance = this._getRowInstance(rowId);

		return rowInstance.getNodeToShow();
		return rowInstance?.getNodeToShow();
		},

		_getDragHandlerNodeFromRowId: function(rowId) {

		var rowNode = this._getRowNodeFromRowId(rowId);

		return rowNode.firstChild.firstChild;
		return rowNode?.firstChild?.firstChild;
		},

		_dragOver: function(id, node, evt) {

client-app/src/component/browser/_GeoJsonParser.js

+30 −49

Original line number	Diff line number	Diff line
		define([
		"dojo/_base/declare"
		, "dojo/_base/lang"
		, "dojo/aspect"
		'dojo/_base/declare'
		, 'dojo/_base/lang'
		], function(
		declare
		, lang
		, aspect
		) {

		return declare(null, {
		// summary:
		//
		// description:
		//

		constructor: function(args) {

		this.config = {

		};
		// Amplía proceso de entrada de datos para el manejo de GeoJSON, aplanando su estructura para facilitar su
		// uso.

		lang.mixin(this, this.config, args);
		_addData: function(response) {

		aspect.before(this, "_addItem", lang.hitch(this, this._addGeoJsonParserItem));
		},

		_dataAvailable: function(response) {

		if (!this._initData && this.initialDataSave) {
		this._initData = lang.clone(response);
		if (!response?.data?.features) {
		this.inherited(arguments);
		}

		var data = lang.clone(response);
		const clonedResponse = lang.clone(response);

		if (response.data.features) {
		clonedResponse.data.data = clonedResponse.data.features;
		delete clonedResponse.data.features;

		data.data.data = data.data.features;
		delete data.data.features;
		}
		arguments[0] = clonedResponse;

		this._addData(data);
		this.inherited(arguments);
		},

		_addGeoJsonParserItem: function(item) {
		_addItem: function(item) {

		for (var key in item.properties) {
		const coordinates = this._getCoordinates(item.geometry);

		item[key] = item.properties[key];
		}

		delete item.properties;

		var geometry = item.geometry;

		if (geometry) {
		const itemData = this._merge([item, item.properties, {coordinates}]);

		geometry = this._getCoordinates(geometry);
		delete itemData.geometry;
		delete itemData.properties;

		if (geometry) {
		item.coordinates = geometry;
		}
		arguments[0] = itemData;

		delete item.geometry;
		}
		this.inherited(arguments);
		},

		_getCoordinates: function(geometry) {

		if (geometry) {
		var coordinates = geometry.coordinates;
		if (geometry.type === "Point") {
		return this._getFirstPointCoordinates(geometry.coordinates);
		const geometryType = geometry?.type,
		coordinates = geometry?.coordinates;

		if (!coordinates?.length) {
		return;
		}

		if (geometryType === 'Point') {
		return this._getFirstPointCoordinates(coordinates);
		}
		},