CDPP / AMDA_IHM

Commit e1798fcc93819e4c08a5075f6a38ad4b3a3a46be

Authored by Benjamin Renard
1 parent 698cdda6
Exists in master and in 96 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Cleanup PlotTabNode

Showing 8 changed files with 13 additions and 266 deletions   Show diff stats
Inline Side-by-side
js/app/models/AmdaNode.js
  Diff comments   View file @e1798fc
... ... @@ -128,20 +128,7 @@ Ext.define('amdaModel.AmdaNode', {
128 128 }
129 129 // if this node is a leaf and have no child
130 130 else if (this.isLeaf() || this.get('nodeType' ) == 'derivedParam' ) {
131   - if (this.get('nodeType') == 'plottab') {
132   - itemKind = amdaUI.ExplorerUI.ITEM_KIND_PTAB;
133   - }
134   - else {
135   - itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
136   - }
137   - }
138   - else if (this.get('nodeType') == 'request') {
139   - if (this.get('tabs') && (this.get('tabs').length > 0)) {
140   - itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
141   - }
142   - else {
143   - itemKind = amdaUI.ExplorerUI.ITEM_KIND_DIRE;
144   - }
  131 + itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
145 132 }
146 133 else if (this.get('isParameter') && this.get('nodeType' ) != 'derivedParam' ) {
147 134 itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
... ...
js/app/models/DownloadNode.js
  Diff comments   View file @e1798fc
... ... @@ -73,7 +73,8 @@ Ext.define('amdaModel.DownloadNode', {
73 73 var fullObject = obj;
74 74 }
75 75  
76   - var i = 0;
  76 + var i = 0;
  77 + // Todo - BRE - PLOTSAVE
77 78 fullObject.tabs().each(function (tab) {
78 79 // only active tab
79 80 if (tab.get('id') == fullObject.get('last-plotted-tab'))
... ...
js/app/models/InteractiveNode.js
  Diff comments   View file @e1798fc
... ... @@ -52,7 +52,7 @@ Ext.define('amdaModel.InteractiveNode', {
52 52 {
53 53 node.eachChild(function(n)
54 54 {
55   - if (!n.isLoaded() && !n.isRealLeaf())
  55 + if (!n.isLoaded() && !n.isLeaf())
56 56 {
57 57 nodesToLoad.push(n);
58 58 me.preloadTreeNode(n,nodesToLoad,onloaded);
... ... @@ -70,7 +70,7 @@ Ext.define('amdaModel.InteractiveNode', {
70 70 {
71 71 records.forEach(function (record)
72 72 {
73   - if (!record.isLoaded() && !record.isRealLeaf())
  73 + if (!record.isLoaded() && !record.isLeaf())
74 74 {
75 75 nodesToLoad.push(record);
76 76 me.preloadTreeNode(record,nodesToLoad,onloaded);
... ... @@ -100,11 +100,6 @@ Ext.define('amdaModel.InteractiveNode', {
100 100 }
101 101 },
102 102  
103   - isRealLeaf: function()
104   - {
105   - return this.isLeaf();
106   - },
107   -
108 103 /**
109 104 * this method is overriden into ExecutableNode to return true
110 105 */
... ... @@ -151,7 +146,7 @@ Ext.define('amdaModel.InteractiveNode', {
151 146 */
152 147 rename: function(value,callBackFn)
153 148 {
154   - var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value, parent : this.data.parentId, leaf: this.isRealLeaf(), nodeType: this.get('nodeType')};
  149 + var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value, parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
155 150 AmdaAction.renameObject(dataToSend, callBackFn);
156 151 },
157 152  
... ... @@ -160,7 +155,7 @@ Ext.define('amdaModel.InteractiveNode', {
160 155 */
161 156 renameDD: function(parentId, callBackFn)
162 157 {
163   - var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: this.isRealLeaf(), nodeType: this.get('nodeType')};
  158 + var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
164 159 AmdaAction.renameObject(dataToSend, callBackFn);
165 160 },
166 161  
... ... @@ -171,7 +166,7 @@ Ext.define('amdaModel.InteractiveNode', {
171 166 */
172 167 isValidName : function(name, callBackFn)
173 168 {
174   - var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isRealLeaf()};
  169 + var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isLeaf()};
175 170 AmdaAction.validNameObject(dataToSend, callBackFn);
176 171 },
177 172  
... ... @@ -530,7 +525,7 @@ Ext.define('amdaModel.InteractiveNode', {
530 525  
531 526 deleteNode: function() {
532 527 // if the target is a directory
533   - if (!this.isRealLeaf()) {
  528 + if (!this.isLeaf()) {
534 529 // determine if this directory is empty before launching the delete confirmation method
535 530 this.isNotEmptyDir(this.confirmDirectoryDeletion);
536 531 // else (the target is a leaf)
... ... @@ -583,14 +578,14 @@ Ext.define('amdaModel.InteractiveNode', {
583 578 */
584 579 realDelete : function()
585 580 {
586   - AmdaAction.deleteObject({id: this.get('id'), leaf: this.isRealLeaf(), nodeType: this.get('nodeType')}, function(res,e){
  581 + AmdaAction.deleteObject({id: this.get('id'), leaf: this.isLeaf(), nodeType: this.get('nodeType')}, function(res,e){
587 582 //TODO proper errors handling
588 583 // node deletion in tree
589 584 if (res) { // if success
590 585 if (res.id) {
591 586 //Ext.Msg.show({title:'Warning', msg: 'Requests with parameter '+node.data.text+' are deleted', icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
592 587 if (this.parentNode) {
593   - if (this.isRealLeaf()){
  588 + if (this.isLeaf()){
594 589 var moduleId = this.get('moduleId');
595 590 // if really interactive node
596 591 if (moduleId) {
... ...
js/app/models/PlotNode.js
  Diff comments   View file @e1798fc
... ... @@ -10,47 +10,15 @@
10 10 Ext.define('amdaModel.PlotNode', {
11 11 extend: 'amdaModel.ExecutableNode',
12 12  
13   - fields : [
14   - {name : 'tabs', type:'auto', defaultValue:false, persist: false}
15   - ],
16   -
17 13 statics: {
18 14 nodeType: 'request'
19 15 },
20 16  
21   - requires:[
22   - 'amdaModel.PlotTabNode'
23   - ],
24   -
25 17 constructor : function(config){
26 18 this.callParent(arguments);
27 19 this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
28 20 this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
29 21 this.set('nodeType',this.self.nodeType);
30   - if (this.get('leaf')) {
31   - this.updateTabs(this.get('tabs'));
32   - }
33   - },
34   -
35   - updateTabs : function(tabs) {
36   - if (tabs) {
37   - var oneTab = (tabs.length == 1);
38   - this.set('leaf', oneTab);
39   - this.set('iconCls', oneTab ? 'icon-plot-page' : 'icon-plot-pages');
40   - this.removeAll();
41   - if (tabs.length > 1) {
42   - var me = this;
43   - Ext.Array.each(tabs, function(tab) {
44   - var tabNode = new amdaModel.PlotTabNode({text: tab.name, tabid: tab.id});
45   - me.appendChild(tabNode);
46   - });
47   - }
48   - this.set('tabs', tabs);
49   - }
50   - },
51   -
52   - specialUpdate : function(res) {
53   - this.updateTabs(res.tabs);
54 22 },
55 23  
56 24 allMenuItems : function() {
... ... @@ -76,10 +44,6 @@ Ext.define('amdaModel.PlotNode', {
76 44 }, {
77 45 fnId : 'leaf-deleteNode',
78 46 text : 'Delete Request'
79   - }, {
80   - fnId : 'leaf-insertTabs',
81   - text : 'Insert in current Plot Request'
82   -
83 47 }];
84 48  
85 49 return menuItems;
... ... @@ -128,35 +92,8 @@ Ext.define('amdaModel.PlotNode', {
128 92 case 'deleteMulti':
129 93 this.deleteMulti();
130 94 break;
131   - case 'insertTabs':
132   - this.insertPlotTabsRequest();
133 95 default:
134 96 break;
135 97 }
136   - },
137   -
138   - isRealLeaf: function()
139   - {
140   - var isFolder = (!this.isLeaf()) && (this.get('tabs') === false);
141   - return !isFolder;
142   - },
143   -
144   - insertPlotTabsRequest: function() {
145   - var me = this;
146   - AmdaAction.getObject(me.get('id'), me.get('nodeType'), function (result,remoteEvent) {
147   - var paramObj = Ext.create(me.get('objectDataModel'), result);
148   - myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
149   - module.createWindow(function () {
150   - var uiContent = module.getUiContent();
151   - if (uiContent != null) {
152   - paramObj.tabs().each(function (tab) {
153   - var tabData = tab.getJsonValues();
154   - uiContent.insertPlotTab(tabData);
155   - });
156   - }
157   - });
158   - });
159   - });
160 98 }
161   -
162 99 });
... ...
js/app/models/PlotTabNode.js deleted
View file @698cdda
... ... @@ -1,164 +0,0 @@
1   -/**
2   - * Project : AMDA-NG4
3   - * Name : PlotTabNode.js
4   - * @class amdaModel.PlotTabNode
5   - * @extends amdaModel.ExecutableNode
6   - * @brief Basic Model of Node corresponding to a tab of a plot request
7   - * @author Benjamin Renard
8   - */
9   -
10   -Ext.define('amdaModel.PlotTabNode', {
11   - extend: 'amdaModel.ExecutableNode',
12   -
13   - fields : [
14   - {name : 'tabid', type:'string', defaultValue:'', persist: false}
15   - ],
16   -
17   - statics: {
18   - nodeType: 'plottab'
19   - },
20   -
21   - constructor : function(config){
22   - this.callParent(arguments);
23   - this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
24   - //this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
25   - this.set('nodeType',this.self.nodeType);
26   - this.set('leaf',true);
27   - this.set('iconCls','icon-plot-page');
28   - },
29   -
30   - allMenuItems : function() {
31   - var menuItems =
32   - [
33   - {
34   - fnId : 'ptab-openTab',
35   - text : 'Open in new Plot Request'
36   - }, {
37   - fnId : 'ptab-insertTab',
38   - text : 'Insert in current Plot Request'
39   - }, {
40   - fnId : 'ptab-renameTab',
41   - text : 'Rename Plot Tab'
42   - }];
43   -
44   - return menuItems;
45   - },
46   -
47   - allMenuMultiItems : function() {
48   - var menuMulti = [
49   - ];
50   - return menuMulti;
51   - },
52   -
53   - getAllContextMenuItems: function(){
54   - return this.allMenuItems();
55   - },
56   -
57   - getMultiContextMenuItems: function(){
58   - return this.allMenuMultiItems();
59   - },
60   -
61   - onMenuItemClick : function(menu,item,event) {
62   -
63   - var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
64   -
65   - switch (fnId) {
66   -
67   - case 'openTab':
68   - this.insertPlotTabRequest(true);
69   - break;
70   -
71   - case 'insertTab':
72   - this.insertPlotTabRequest(false);
73   - break;
74   -
75   - case 'renameTab':
76   - this.renameTab();
77   - break;
78   - default:
79   - break;
80   - }
81   - },
82   -
83   - insertPlotTabRequest : function(inNewRequest) {
84   - var me = this;
85   - amdaModel.InteractiveNode.preloadNodes(this.parentNode.getRootNode(), function() {
86   - AmdaAction.getObject(me.parentNode.get('id'), me.parentNode.get('nodeType'), function (result,remoteEvent) {
87   - var paramObj = Ext.create(me.parentNode.get('objectDataModel'), result);
88   - var tabData = null;
89   - paramObj.tabs().each(function(tab) {
90   - if (tab.get('id') == me.get('tabid')) {
91   - tabData = tab.getJsonValues();
92   - }
93   - });
94   - if (tabData != null) {
95   - if (inNewRequest) {
96   - tabData['id'] = 1;
97   - paramObj.set('id','');
98   - paramObj.set('name', '');
99   - paramObj.set('folderId', '');
100   - paramObj.set('active-tab-id', 1);
101   - paramObj.set('last-tab-id', 1);
102   - paramObj.set('last-plotted-tab', 1);
103   - paramObj.loadTabs([tabData]);
104   - myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
105   - module.setContextNode(me.parentNode.getRootNode());
106   - module.createWindow(function () {
107   - var uiContent = module.getUiContent();
108   - if (uiContent != null) {
109   - uiContent.resetProcess(paramObj.getJsonValues());
110   - }
111   - });
112   - });
113   - }
114   - else {
115   - myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
116   - module.createWindow(function () {
117   - var uiContent = module.getUiContent();
118   - if (uiContent != null) {
119   - var tabObj = new amdaPlotObj.PlotTabObject(tabData);
120   - uiContent.insertPlotTab(tabData);
121   - }
122   - });
123   - });
124   - }
125   - }
126   - }, me);
127   - });
128   - },
129   -
130   - editPlotTab : function() {
131   - var me = this;
132   - this.parentNode.editLeaf(function () {
133   - myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
134   - var uiContent = module.getUiContent();
135   - if (uiContent != null) {
136   - uiContent.forceActiveTab(me.get('tabid'));
137   - }
138   - });
139   - });
140   - },
141   -
142   - renameTab: function() {
143   - if (this.myGetOwnerTree()) {
144   - var item = this.myGetOwnerTree().getSelectionModel().selected.items[0];
145   - this.myGetOwnerTree().fireEvent('edition', this.myGetOwnerTree().view, item);
146   - }
147   - },
148   -
149   - rename: function(value,callBackFn) {
150   - var me = this;
151   - var dataToSend = {id : this.get('tabid'), old_name: this.modified.text, name: value, parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
152   - AmdaAction.renameObject(dataToSend, function (result) {
153   - callBackFn(result);
154   - myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
155   - var uiContent = module.getUiContent();
156   - if (uiContent != null) {
157   - if ((module.linkedNode != null) && (module.linkedNode.get('id') == dataToSend.parent)) {
158   - uiContent.updatePlotTabName(dataToSend.id, dataToSend.name);
159   - }
160   - }
161   - });
162   - });
163   - },
164   -});
js/app/views/ExplorerUI.js
  Diff comments   View file @e1798fc
... ... @@ -102,7 +102,6 @@ Ext.define('amdaUI.ExplorerUI', {
102 102 ITEM_KIND_LEAF : 'leaf',
103 103 ITEM_KIND_DIRE : 'dire',
104 104 ITEM_KIND_PARA : 'para',
105   - ITEM_KIND_PTAB : 'ptab', //plot tab
106 105 ITEM_KIND_MISS : 'miss'
107 106 },
108 107  
... ... @@ -354,7 +353,6 @@ Ext.define('amdaUI.ExplorerUI', {
354 353 case 'remoteParam' :
355 354 case 'remoteSimuParam' :
356 355 case 'myData' :
357   - case 'plottab' :
358 356 return false;
359 357 default :
360 358 if (draggedRecord.data.id == targetNode.data.nodeType+'-treeRootNode')
... ... @@ -577,7 +575,7 @@ Ext.define('amdaUI.ExplorerUI', {
577 575 });
578 576 }
579 577  
580   - if (record.isLeaf() || record.data.isParameter || (record.data.tabs && (record.data.tabs.length > 0)))
  578 + if (record.isLeaf() || record.data.isParameter)
581 579 switch (record.get('nodeType'))
582 580 {
583 581 case 'myData' :
... ... @@ -591,9 +589,6 @@ Ext.define('amdaUI.ExplorerUI', {
591 589 case 'condition' :
592 590 record.editLeaf();
593 591 break;
594   - case 'plottab' :
595   - record.editPlotTab();
596   - break;
597 592 case 'localParam' :
598 593 case 'remoteParam':
599 594 case 'remoteSimuParam':
... ... @@ -1029,7 +1024,7 @@ Ext.define( 'MyTreeEditor', {
1029 1024 event.record.commit();
1030 1025 var rec = event.record.data;
1031 1026 // in case of directory
1032   - if (!rec.leaf && (rec.nodeType != 'plottab')){
  1027 + if (!rec.leaf){
1033 1028 // set folder's ID returned by server
1034 1029 rec.id = result.id;
1035 1030 }
... ...
js/resources/css/amda.css
  Diff comments   View file @e1798fc
... ... @@ -462,10 +462,6 @@ p + p {
462 462 background-image:url( ../images/16x16/plot_page.png ) !important;
463 463 }
464 464  
465   -.icon-plot-pages {
466   - background-image:url( ../images/16x16/plot_pages.png ) !important;
467   -}
468   -
469 465 .icon-plot-layout {
470 466 background-image:url( ../images/16x16/plot_layout.png ) !important;
471 467 }
... ...
js/resources/images/16x16/plot_pages.png deleted
View file @698cdda

150 Bytes