remove targetclass cb (WIP)

Nathanael Jourdane
1 parent 5deeade0
Showing 2 changed files with 79 additions and 182 deletions Show diff stats
js/app/controllers/EpnTapModule.js
js/app/views/EpnTapUI.js
@@ -42,6 +42,7 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
  
 		this.servicesStore.load();
 		this.metadataStore.load();
+		this.productTypesStore.load();
 	},
  
 	aquireElements: function() {
@@ -49,7 +50,6 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		this.servicesGrid = Ext.getCmp('epnTapServicesGrid');
 		this.granulesGrid = Ext.getCmp('epnTapGranulesGrid');
 		this.productTypeCB = Ext.getCmp('epnTapProductTypeCB');
-		this.targetClassCB = Ext.getCmp('epnTapTargetClassCB');
 		this.targetNameCB = Ext.getCmp('epnTapTargetNameCB');
 		this.timeSelector = Ext.getCmp('epnTapTimeSelector');
 		this.rowsPerPageNf = Ext.getCmp('epnTapRowsPerPageNf');
@@ -65,20 +65,7 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		this.granulesStore = Ext.data.StoreManager.lookup('granulesStore');
 		this.metadataStore = Ext.data.StoreManager.lookup('metadataStore')
 		this.productTypesStore = Ext.data.StoreManager.lookup('productTypesStore');
-		this.targetClassesStore = Ext.data.StoreManager.lookup('targetClassesStore');
 		this.targetNamesStore = Ext.data.StoreManager.lookup('targetNamesStore');
-		this.productTypeDict = { 'im': 'Image',
-								 'ma': 'Map',
-								 'sp': 'Spectrum',
-								 'ds': 'Dynamic spectrum',
-								 'sc': 'Spectral cube',
-								 'pr': 'Profile',
-								 'vo': 'Volume',
-								 'mo': 'Movie',
-								 'cu': 'Cube',
-								 'ts': 'Time series',
-								 'ca': 'Catalogue',
-								 'ci': 'Catalogue item'};
 	},
  
 	addStoreListeners: function() {
@@ -96,30 +83,39 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 			scope: this
 		});
  
-		// Fill productTypeCB if epntap is lauched from InteropUI
-		this.metadataStore.on('load', function(store) {
-			if(!this.target) {
-				var dataproductTypes = store.collect('dataproduct_type');
-
-				// Update productTypeCB
-				this.productTypesStore.add({'id': 'all', 'name': 'All dataproduct types'});
-				for (var i = 0; i < dataproductTypes.length; i++) {
-					if (dataproductTypes[i] in this.productTypeDict) {
-						this.productTypesStore.add({'id': dataproductTypes[i], 'name': this.productTypeDict[dataproductTypes[i]]});
-					} else {
-						var vals = new Array();
-						for (var key in this.productTypeDict) {
-							vals.push(this.productTypeDict[key]);
-						}
-						if(vals.indexOf(dataproductTypes[i]) <= -1) {
-							console.log('Unknown data product type "' + dataproductTypes[i] + '".');
-						}
-						this.productTypesStore.add({'id': dataproductTypes[i], 'name': dataproductTypes[i]});
-					}
+		this.productTypesStore.on({
+			load: function(store) {
+				this.productTypeDict = {};
+				for (var key in store.data.map) {
+					this.productTypeDict[key] = store.data.map[key].data.name;
 				}
-				this.productTypeCB.select('all');
-			}
-		}, this);
+			},
+			scope: this
+		});
+		// Fill productTypeCB if epntap is lauched from InteropUI
+		// this.metadataStore.on('load', function(store) {
+		// 	if(!this.target) {
+		// 		var dataproductTypes = store.collect('dataproduct_type');
+		//
+		// 		// Update productTypeCB
+		// 		this.productTypesStore.add({'id': 'all', 'name': 'All dataproduct types'});
+		// 		for (var i = 0; i < dataproductTypes.length; i++) {
+		// 			if (dataproductTypes[i] in this.productTypeDict) {
+		// 				this.productTypesStore.add({'id': dataproductTypes[i], 'name': this.productTypeDict[dataproductTypes[i]]});
+		// 			} else {
+		// 				var vals = new Array();
+		// 				for (var key in this.productTypeDict) {
+		// 					vals.push(this.productTypeDict[key]);
+		// 				}
+		// 				if(vals.indexOf(dataproductTypes[i]) <= -1) {
+		// 					console.log('Unknown data product type "' + dataproductTypes[i] + '".');
+		// 				}
+		// 				this.productTypesStore.add({'id': dataproductTypes[i], 'name': dataproductTypes[i]});
+		// 			}
+		// 		}
+		// 		this.productTypeCB.select('all');
+		// 	}
+		// }, this);
 	},
  
 	addUIListeners: function() {
@@ -136,11 +132,6 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 			this.updateNbResults();
 		}, this);
  
-		this.targetClassCB.on('select', function(cb) {
-			this.onTargetClassCBChanged(cb.value);
-			this.updateNbResults();
-		}, this);
-
 		this.targetNameCB.on('select', function(cb) {
 			this.onTargetNameCBChanged(cb.value);
 			this.updateNbResults();
@@ -218,28 +209,17 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 			this.productTypeCB.select(target[0]);
 			this.productTypeCB.enable();
  
-			this.targetClassCB.getStore().add({'id': target[1], 'name': this.prettify(target[1])});
-			this.targetClassCB.select(target[1]);
-			this.targetClassCB.enable();
-
 			this.targetNameCB.getStore().add({'id': target[2], 'name': this.prettify(target[2])});
 			this.targetNameCB.select(target[2]);
-			this.targetNameCB.enable();
  
 			this.updateNbResults();
 		// If the EPN-TAP module is launched from the Interop window
 		} else {
 			this.productTypeCB.select('all');
  
-			// Update targetClassCB
-			this.targetClassCB.getStore().add({'id': 'all', 'name': 'All target classes'});
-			this.targetClassCB.select('all');
-			this.targetClassCB.disable();
-
 			// Update targetNameCB
 			this.targetNameCB.getStore().add({'id': 'all', 'name': 'All target names'});
 			this.targetNameCB.select('all');
-			this.targetNameCB.disable();
  
 			this.servicesStore.each(function(record, idx) {
 				record.set('nb_results', this.metadataStore.sum('nb_results'));
@@ -250,73 +230,13 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 	/**
 	Trigerred when *the user* (not `productTypeCB.select()`) select a new item in `productTypeCB`
 	(see `EpnTapUI.createProductTypeCB()`).
-	Among other things, updates the `targetClassCB` combobox and the `servicesGrid` table.
+	Among other things, updates the `servicesGrid` table.
 	*/
 	onProductTypeCBChanged: function() {
-		this.granulesStore.removeAll();
-		this.targetClassCB.getStore().removeAll();
-		this.targetNameCB.getStore().removeAll();
-		this.targetNameCB.disable();
-
-		if (this.productTypeCB.value == 'all') {
-			this.targetClassCB.disable();
-		} else {
-			this.metadataStore.filter('dataproduct_type', this.productTypeCB.value)
-			var targetClasses = this.metadataStore.collect('target_class');
-
-			if (targetClasses.length == 1) {
-				this.targetClassCB.getStore().add({'id': targetClasses[0], 'name': this.prettify(targetClasses[0])});
-				this.targetClassCB.disable();
-				this.targetClassCB.select(this.targetClassCB.getStore().getAt(0)['internalId']);
-			} else {
-				var name = this.productTypeCB.value in this.productTypeDict ? this.productTypeDict[this.productTypeCB.value] : this.productTypeCB.value;
-				this.targetClassCB.getStore().add({'id': 'all', 'name': this.allPrettify(name)});
-				// this.targetClassCB.getStore().add({'id': 'all', 'name': 'All'});
-				for (var i = 0; i < targetClasses.length; i++) {
-					this.targetClassCB.getStore().add({'id': targetClasses[i], 'name': this.prettify(targetClasses[i])});
-				}
-				this.targetClassCB.select('all');
-				this.targetClassCB.enable();
-			}
-		}
-		this.targetNameCB.getStore().add({'id': 'all', 'name': 'All target names'});
-		this.targetNameCB.select('all');
 	},
  
 	/**
-	Trigerred when *the user* (not `targetClassCB.select()`) select a new item in `targetClassCB` (see
-	`EpnTapUI.createTargetClassCB()`).
-	Among other things, updates the `targetNameCB` combobox and the `servicesGrid` table.
-	*/
-	onTargetClassCBChanged: function() {
-		this.granulesStore.removeAll();
-		this.targetNameCB.getStore().removeAll();
-
-		if (this.targetClassCB.value == 'all') {
-			this.targetNameCB.getStore().add({'id': 'all', 'name': 'All target names'});
-			this.targetNameCB.select('all');
-			this.targetNameCB.disable();
-		} else {
-			this.metadataStore.filter('target_class', this.targetClassCB.value);
-			var targetNames = this.metadataStore.collect('target_name');
-			if (targetNames.length == 1) {
-				this.targetNameCB.getStore().add({'id': targetNames[0], 'name': this.prettify(targetNames[0])});
-				this.targetNameCB.select(this.targetNameCB.getStore().getAt(0)['internalId']);
-				this.targetNameCB.disable();
-			} else {
-				this.targetNameCB.getStore().add({'id': 'all', 'name': this.allPrettify(this.targetClassCB.value)});
-				for (var i = 0; i < targetNames.length; i++) {
-					this.targetNameCB.getStore().add({'id': targetNames[i], 'name': this.prettify(targetNames[i])});
-				}
-				this.targetNameCB.select('all');
-				this.targetNameCB.enable();
-			}
-		}
-	},
-
-	/**
-	Trigerred when *the user* (not `targetClassCB.select()`) select a new item in `targetNameCB`
-	(see `EpnTapUI.createTargetNameCB()`).
+	Trigerred when the user select a new item in `targetNameCB` (see `EpnTapUI.createTargetNameCB()`).
 	Updates the `servicesGrid` table.
 	*/
 	onTargetNameCBChanged: function() {
@@ -458,20 +378,16 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 	*/
 	updateNbResults: function() {
 		if(this.productTypeCB.value === 'all' && !this.launchedFromTree ) {
-			var filter = [];
-		} else if(this.targetClassCB.value === 'all') {
 			var filter = [
 				{property: "dataproduct_type", value: this.productTypeCB.value}
 			];
 		} else if(this.targetNameCB.value === 'all') {
 			var filter = [
-				{property: "dataproduct_type", value: this.productTypeCB.value},
-				{property: "target_class", value: this.targetClassCB.value}
+				{property: "dataproduct_type", value: this.productTypeCB.value}
 			];
 		} else {
 			var filter = [
 				{property: "dataproduct_type", value: this.productTypeCB.value},
-				{property: "target_class", value: this.targetClassCB.value},
 				{property: "target_name", value: this.targetNameCB.value}
 			];
 		}
@@ -25,26 +25,25 @@ Notes:
 in this store and an information message is displayed on the JavaScript console during the panel creation.
 - if a data product type is not present in any of the granules from the EPN-TAP services, it is not present in this
 store.
-*/
-Ext.create('Ext.data.ArrayStore', {
-	storeId:'productTypesStore',
-	fields: ['id', 'name']
-});
-
-/**
-`targetClassesStore`: An ExtJS Store containing the list of the different target classes defined on all granules, on
-all available EPN-TAP services (defined in `generic_data/EpnTapData/metadata.json`, updated periodically with a cron
-script), which match with the selected data product type.
-
-This list is used to fill the `targetClassCB` combo box, which is updated by `EpnTapModule` each time a new product type
-is selected.
-
-- `id`: the target class in lowercase, with the underscore between each word;
-- `name`: the target class, capitalized with spaces between each word (done `EpnTapModule.prettify()`).
+TODO: try "var arrayStore = Ext.create(...);"
 */
 Ext.create('Ext.data.Store', {
-	storeId:'targetClassesStore',
-	fields: ['id', 'name']
+	storeId:'productTypesStore',
+	fields: ['id', 'name'],
+	data: [
+		{'id': 'im', 'name': 'Image'},
+		{'id': 'ma', 'name': 'Map'},
+		{'id': 'sp', 'name': 'Spectrum'},
+		{'id': 'ds', 'name': 'Dynamic spectrum'},
+		{'id': 'sc', 'name': 'Spectral cube'},
+		{'id': 'pr', 'name': 'Profile'},
+		{'id': 'vo', 'name': 'Volume'},
+		{'id': 'mo', 'name': 'Movie'},
+		{'id': 'cu', 'name': 'Cube'},
+		{'id': 'ts', 'name': 'Time series'},
+		{'id': 'ca', 'name': 'Catalogue'},
+		{'id': 'ci', 'name': 'Catalogue item'}
+	]
 });
  
 /**
@@ -210,9 +209,8 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 				xtype : 'container',
 				flex: 3,
 				items: [
-					this.createProductTypeCB(),
-					this.createTargetClassCB(),
 					this.createTargetNameCB(),
+					this.createProductTypeCB(),
 					{
 						xtype: 'panel',
 						layout: { type: 'hbox', pack: 'start', align: 'stretch' },
@@ -241,7 +239,7 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 	`epnTapProductTypesStore`, which is initilized by `EpnTapModule`.
  
 	The selection of a produt type triggers `EpnTapModule.onProductTypeCBChanged()`, which basically update
-	`epnTapTargetClassCB` and `epnTapGranulesGrid`.
+	`epnTapGranulesGrid`.
 	*/
 	createProductTypeCB: function() {
 		return {
@@ -251,28 +249,7 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 			store: Ext.data.StoreManager.lookup('productTypesStore'),
 			queryMode: 'local',
 			valueField: 'id',
-			maxWidth: 100,
 			displayField: 'name',
-			editable: false
-		};
-	},
-
-	/**
-	Create `epnTapTargetClassCB`, an ExtJS ComboBox, containing a list of target classes corresponding to the
-	selected product type, as defined in `targetClassesStore`, which is initilized by `EpnTapModule`.
-
-	The selection of a target class triggers the `EpnTapModule.onTargetClassCBChanged()`, which basically updates
-	`targetNameCB` and `granulesGrid`.
-	*/
-	createTargetClassCB: function() {
-		return {
-			xtype: 'combobox',
-			id: 'epnTapTargetClassCB',
-			fieldLabel: 'Target class',
-			store: Ext.data.StoreManager.lookup('targetClassesStore'),
-			queryMode: 'local',
-			displayField: 'name',
-			valueField: 'id',
 			maxWidth: 100,
 			editable: false
 		};
@@ -291,18 +268,34 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 			id: 'epnTapTargetNameCB',
 			fieldLabel: 'Target name',
 			store: Ext.data.StoreManager.lookup('targetNamesStore'),
-			queryMode: 'local',
+			queryMode: 'remote',
 			displayField: 'name',
 			valueField: 'id',
-			triggerAction: 'all',
-			typeAhead: true,
 			maxWidth: 100,
-			mode: 'remote',
 			minChars: 2,
-			forceSelection: true
+
+			// triggerAction: 'all',
+			// mode: 'remote',
+			// forceSelection: true
+
+			emptyText: 'Earth, Saturn, 67P, ...',
+			editable: true,
+			autoSelect: false,
+			forceSelection: false,
+			hideTrigger: true,
+			selectOnFocus: false,
+			listeners: {
+				specialkey: function(field, e){
+					if (e.getKey() == e.ENTER) {
+						console.log('yolo');
+					}
+				}
+			}
+
 		};
 	},
  
+
 	/**
 	Create `epnTapTimeSelector`, an IntervalUI object, allowing the user to select a time interval (by filling two
 	dates and/or a duration).
@@ -537,21 +530,9 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 			return '<img width="40px height="40px" src="' + val + '">';
 		};
 		var dptRender = function(val) {
-			productTypeDict = {
-				'im': 'Image',
-				'ma': 'Map',
-				'sp': 'Spectrum',
-				'ds': 'Dynamic spectrum',
-				'sc': 'Spectral cube',
-				'pr': 'Profile',
-				'vo': 'Volume',
-				'mo': 'Movie',
-				'cu': 'Cube',
-				'ts': 'Time series',
-				'ca': 'Catalogue',
-				'ci': 'Catalogue item'
-			};
-			return (val in productTypeDict) ? '<p style="white-space: normal;">' + productTypeDict[val] + '</p>' : '<em>' + val + '</em>';
+			console.log(Ext.data.StoreManager.lookup('productTypesStore'));
+			return val;
+			// (val in productTypeDict) ? '<p style="white-space: normal;">' + productTypeDict[val] + '</p>' : '<em>' + val + '</em>';
 		};
 		var formatRender = function(val) {
 			// A dictionnary used to associate the mimetype (i.e "application/fits") to a pretty printed word (i.e "fits").