-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#118 Added delay and debounce for import progress
- Loading branch information
Showing
1 changed file
with
99 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,99 +1,107 @@ | ||
| app.controller("importCtrl", function ($scope, $rootScope, $interval, centsa) { | ||
| $scope.rules = []; | ||
| centsa.general.rules().then(resp => { | ||
| $scope.rules = resp.data; | ||
| $scope.rule = resp.data.find(x => x.name == "Default").id.toString(); | ||
| }); | ||
| app.controller("importCtrl", function ($scope, $rootScope, $timeout, centsa) { | ||
| $scope.rules = []; | ||
| centsa.general.rules().then(resp => { | ||
| $scope.rules = resp.data; | ||
| $scope.rule = resp.data.find(x => x.name == "Default").id.toString(); | ||
| }); | ||
|
|
||
| $scope.importProgress = { | ||
| processed: 0, | ||
| total: 1 | ||
| }; | ||
| $scope.importProgress = { | ||
| processed: 0, | ||
| total: 1 | ||
| }; | ||
|
|
||
| $scope.importFile = () => { | ||
| $scope.importError = ""; | ||
| $('#progressModal').modal({ | ||
| backdrop: 'static', | ||
| keyboard: false | ||
| }).appendTo("body"); | ||
| $scope.importFile = () => { | ||
| $scope.importError = ""; | ||
| $('#progressModal').modal({ | ||
| backdrop: 'static', | ||
| keyboard: false | ||
| }).appendTo("body"); | ||
|
|
||
| const importWorker = new Worker("/workers/importWorker.js"); | ||
| const importWorker = new Worker("/workers/importWorker.js"); | ||
|
|
||
| importWorker.addEventListener('message', e => { | ||
| if (e.data) { | ||
| $scope.$apply(() => { | ||
| $scope.importProgress = e.data; | ||
| }); | ||
| } else { | ||
| $('#progressModal').appendTo(".content").modal("hide"); | ||
| } | ||
| }); | ||
| importWorker.addEventListener('error', e => { | ||
| $scope.$apply(() => { | ||
| $scope.importError = `Error: ${e.message}`; | ||
| }); | ||
| }); | ||
| importWorker.postMessage({ | ||
| rule: $scope.rule, | ||
| script: $scope.rules.find(x => x.id == $scope.rule).script, | ||
| csv: $scope.uploadFile | ||
| }); | ||
| }; | ||
| let debounceTimeout; | ||
| importWorker.addEventListener('message', ({data}) => { | ||
| if (data) { | ||
| $timeout.cancel(debounceTimeout); | ||
| debounceTimeout = $timeout(() => { | ||
| $scope.importProgress = data; | ||
| }, 200); | ||
| } else { | ||
| $timeout(() => { | ||
| $scope.importProgress = { | ||
| processed: 0, | ||
| total: 1 | ||
| }; | ||
| $('#progressModal').appendTo(".content").modal("hide"); | ||
| }, 1000); | ||
| } | ||
| }); | ||
| importWorker.addEventListener('error', ({message}) => { | ||
| $scope.$apply(() => { | ||
| $scope.importError = `Error: ${message}`; | ||
| }); | ||
| }); | ||
| importWorker.postMessage({ | ||
| rule: $scope.rule, | ||
| script: $scope.rules.find(x => x.id == $scope.rule).script, | ||
| csv: $scope.uploadFile | ||
| }); | ||
| }; | ||
|
|
||
| $scope.showEditor = false; | ||
| let editor; | ||
| $scope.showEditor = false; | ||
| let editor; | ||
|
|
||
| $scope.$watch('rule', newValue => { | ||
| if (newValue == "") { | ||
| $scope.newRuleName = ""; | ||
| $scope.showEditor = true; | ||
| if (editor) { | ||
| editor.getSession().setValue('/** Enter import rule script here **/'); | ||
| } | ||
| } else if (newValue) { | ||
| $scope.newRuleName = $scope.rules.find(x => x.id == newValue).name; | ||
| } | ||
| }); | ||
| $scope.updateEditor = () => { | ||
| if ($scope.rule) { | ||
| centsa.general.rule($scope.rule).then(resp => { | ||
| const script = resp.data; | ||
| editor.getSession().setValue(script); | ||
| $scope.rules.find(x => x.id == $scope.rule).script = resp.data; | ||
| }); | ||
| } | ||
| }; | ||
| $scope.$watch('showEditor', show => { | ||
| if (show) { | ||
| editor = ace.edit('editor'); | ||
| editor.setTheme("ace/theme/chrome"); | ||
| editor.session.setMode("ace/mode/javascript"); | ||
| $scope.updateEditor(); | ||
| editor.$blockScrolling = Infinity; | ||
| editor.setOptions({ | ||
| maxLines: Infinity | ||
| }); | ||
| } | ||
| }); | ||
| $scope.$watch('rule', newValue => { | ||
| if (newValue == "") { | ||
| $scope.newRuleName = ""; | ||
| $scope.showEditor = true; | ||
| if (editor) { | ||
| editor.getSession().setValue('/** Enter import rule script here **/'); | ||
| } | ||
| } else if (newValue) { | ||
| $scope.newRuleName = $scope.rules.find(x => x.id == newValue).name; | ||
| } | ||
| }); | ||
| $scope.updateEditor = () => { | ||
| if ($scope.rule) { | ||
| centsa.general.rule($scope.rule).then(resp => { | ||
| const script = resp.data; | ||
| editor.getSession().setValue(script); | ||
| $scope.rules.find(x => x.id == $scope.rule).script = resp.data; | ||
| }); | ||
| } | ||
| }; | ||
| $scope.$watch('showEditor', show => { | ||
| if (show) { | ||
| editor = ace.edit('editor'); | ||
| editor.setTheme("ace/theme/chrome"); | ||
| editor.session.setMode("ace/mode/javascript"); | ||
| $scope.updateEditor(); | ||
| editor.$blockScrolling = Infinity; | ||
| editor.setOptions({ | ||
| maxLines: Infinity | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| $scope.saveRule = () => { | ||
| const script = editor.getSession().getValue(); | ||
| centsa.general.saveRule($scope.newRuleName, script).then(resp => { | ||
| const id = resp.data; | ||
| const newRule = $scope.rules.find(x => x.name == $scope.newRuleName); | ||
| if (newRule) { | ||
| newRule.script = script; | ||
| newRule.id = id; | ||
| } else { | ||
| $scope.rules.push({ | ||
| name: $scope.newRuleName, | ||
| id: id, | ||
| script: script | ||
| }); | ||
| } | ||
| $scope.rule = id.toString(); | ||
| }); | ||
| }; | ||
| $scope.saveRule = () => { | ||
| const script = editor.getSession().getValue(); | ||
| centsa.general.saveRule($scope.newRuleName, script).then(resp => { | ||
| const id = resp.data; | ||
| const newRule = $scope.rules.find(x => x.name == $scope.newRuleName); | ||
| if (newRule) { | ||
| newRule.script = script; | ||
| newRule.id = id; | ||
| } else { | ||
| $scope.rules.push({ | ||
| name: $scope.newRuleName, | ||
| id: id, | ||
| script: script | ||
| }); | ||
| } | ||
| $scope.rule = id.toString(); | ||
| }); | ||
| }; | ||
|
|
||
| $scope.isRuleNameValid = () => $scope.newRuleName && $scope.newRuleName != 'Default'; | ||
| }); | ||
| $scope.isRuleNameValid = () => $scope.newRuleName && $scope.newRuleName != 'Default'; | ||
| }); |