Fix button apply

algenty · Jan 24, 2020 · fee0569 · fee0569
1 parent 7efe2a0
commit fee0569
Show file tree

Hide file tree

Showing 9 changed files with 229 additions and 221 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,7 @@ See more example at draw.io
 ### Fixed
   - Fix endless loading when edit graph [(issue #102)](https://github.com/algenty/grafana-flowcharting/issues/102)
   - Fix error on edit mode for timeserie [(issue #100)](https://github.com/algenty/grafana-flowcharting/issues/100)
+  - Fix "Apply button" in inspect mode [(issue #104)](https://github.com/algenty/grafana-flowcharting/issues/104)
 
 ## [[0.6.0]](https://algenty.github.io/flowcharting-repository/archives/agenty-flowcharting-panel-0.6.0.zip) - 2019-12-20  
 ### Added  

diff --git a/dist/LICENSE b/dist/LICENSE
diff --git a/dist/README.md b/dist/README.md
@@ -33,6 +33,7 @@ See more example at draw.io
 ### Fixed
   - Fix endless loading when edit graph [(issue #102)](https://github.com/algenty/grafana-flowcharting/issues/102)
   - Fix error on edit mode for timeserie [(issue #100)](https://github.com/algenty/grafana-flowcharting/issues/100)
+  - Fix "Apply button" in inspect mode [(issue #104)](https://github.com/algenty/grafana-flowcharting/issues/104)
 
 ## [[0.6.0]](https://algenty.github.io/flowcharting-repository/archives/agenty-flowcharting-panel-0.6.0.zip) - 2019-12-20  
 ### Added  

diff --git a/dist/img/agenty-flowcharting.svg b/dist/img/agenty-flowcharting.svg
diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/partials/inspect_options.html b/dist/partials/inspect_options.html
@@ -23,7 +23,7 @@ <h5 class="section-heading">Graph inspect
 				<table class="table-panel-table">
 					<thead>
 						<tr>
-							<th style="width: 100px;">
+							<th style="width: 150px;">
 								<div class="table-panel-table-header-inner pointer">
 									Id
 									<info-popover mode="right-normal">

diff --git a/src/inspect_options.ts b/src/inspect_options.ts
@@ -55,6 +55,7 @@ export class InspectOptionsCtrl {
   onChangeId(state: State) {
     if (state.newcellId !== undefined && state.cellId !== state.newcellId) {
       state.edited = true;
+      this.flowchartHandler.getFlowchart().getStateHandler().edited = true;
       if (state.previousId === undefined) {
         state.previousId = state.cellId;
       }
@@ -67,6 +68,8 @@ export class InspectOptionsCtrl {
   onEdit(state: State) {
     state.edit = true;
     state.newcellId = state.cellId;
+    // let stateHandler = this.flowchartHandler.getFlowchart().getStateHandler();
+    // stateHandler.edited = true;
     const elt = document.getElementById(state.cellId);
     setTimeout(() => {
       if (elt) {
@@ -87,8 +90,10 @@ export class InspectOptionsCtrl {
     states.forEach(state => {
       if (state.edited && state.previousId) {
         flowchart.renameId(state.previousId, state.cellId);
+        state.edited = false;
       }
     });
+    this.flowchartHandler.getFlowchart().getStateHandler().edited = false;
     flowchart.applyModel();
   }
 

diff --git a/src/partials/inspect_options.html b/src/partials/inspect_options.html
@@ -23,7 +23,7 @@ <h5 class="section-heading">Graph inspect
 				<table class="table-panel-table">
 					<thead>
 						<tr>
-							<th style="width: 100px;">
+							<th style="width: 150px;">
 								<div class="table-panel-table-header-inner pointer">
 									Id
 									<info-popover mode="right-normal">

diff --git a/src/statesHandler.ts b/src/statesHandler.ts
@@ -13,6 +13,7 @@ import XGraph from 'graph_class';
 export default class StateHandler {
   states: Map<string, State>;
   xgraph: XGraph;
+  edited = false;
   constructor(xgraph: XGraph) {
     GFP.log.info('StateHandler.constructor()');
     this.states = new Map();