diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index b39eb66c..8506110b 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -1433,10 +1433,18 @@ BUILD 8.0.0-beta.0.11 CHANGES OF NOTE to fix this put "const" in front unless the variable will be later reassigned in which case put "let" in front. Easiest way is put const in front and it will give an error if it should be let so the above example would turn into "for (const EachGroup of ayData.ayReportData) " Any other non-obvious errors it shows let me know it may be something I need to tweak - - added intellisense (actually part of above error checking but it's a side bonus) Will now show intellisense when you type for the built in functions like ayGetFromAPI() etc with prompts on what to enter - +- Joyce todo all reports open them and examine Prepare Data tab and look for errors and fix please +- Joyce TODO all reports that have it please remove example 'loud' helper which is still in some reports + in all reports that still have it completely remove this: + //Register custom Handlebars helpers here to use in your report script + //https://handlebarsjs.com/guide/#custom-helpers + Handlebars.registerHelper('loud', function (aString) { + return aString.toUpperCase() + }) + so that the Helpers tab is empty (unless using a custom helper but I don't think there are any) + diff --git a/ayanova/package-lock.json b/ayanova/package-lock.json index a6a9a1b5..eaaf0685 100644 --- a/ayanova/package-lock.json +++ b/ayanova/package-lock.json @@ -21,8 +21,8 @@ "jwt-decode": "^3.1.2", "luxon": "^1.28.0", "marked": "^1.2.9", - "monaco-editor": "^0.22.3", - "monaco-editor-webpack-plugin": "^3.1.0", + "monaco-editor": "^0.30.1", + "monaco-editor-webpack-plugin": "^6.0.0", "nprogress": "^0.2.0", "register-service-worker": "^1.7.2", "vue": "^2.6.14", @@ -10126,19 +10126,19 @@ } }, "node_modules/monaco-editor": { - "version": "0.22.3", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.22.3.tgz", - "integrity": "sha512-RM559z2CJbczZ3k2b+ouacMINkAYWwRit4/vs0g2X/lkYefDiu0k2GmgWjAuiIpQi+AqASPOKvXNmYc8KUSvVQ==" + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz", + "integrity": "sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==" }, "node_modules/monaco-editor-webpack-plugin": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-3.1.0.tgz", - "integrity": "sha512-TP5NkCAV0OeFTry5k/d60KR7CkhTXL4kgJKtE3BzjgbDb5TGEPEhoKmHBrSa6r7Oc0sNbPLZhKD/TP2ig7A+/A==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-6.0.0.tgz", + "integrity": "sha512-vC886Mzpd2AkSM35XLkfQMjH+Ohz6RISVwhAejDUzZDheJAiz6G34lky1vyO8fZ702v7IrcKmsGwL1rRFnwvUA==", "dependencies": { "loader-utils": "^2.0.0" }, "peerDependencies": { - "monaco-editor": "0.22.x || 0.23.x || 0.24.x", + "monaco-editor": "0.30.x", "webpack": "^4.5.0 || 5.x" } }, @@ -24759,14 +24759,14 @@ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, "monaco-editor": { - "version": "0.22.3", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.22.3.tgz", - "integrity": "sha512-RM559z2CJbczZ3k2b+ouacMINkAYWwRit4/vs0g2X/lkYefDiu0k2GmgWjAuiIpQi+AqASPOKvXNmYc8KUSvVQ==" + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz", + "integrity": "sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==" }, "monaco-editor-webpack-plugin": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-3.1.0.tgz", - "integrity": "sha512-TP5NkCAV0OeFTry5k/d60KR7CkhTXL4kgJKtE3BzjgbDb5TGEPEhoKmHBrSa6r7Oc0sNbPLZhKD/TP2ig7A+/A==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-6.0.0.tgz", + "integrity": "sha512-vC886Mzpd2AkSM35XLkfQMjH+Ohz6RISVwhAejDUzZDheJAiz6G34lky1vyO8fZ702v7IrcKmsGwL1rRFnwvUA==", "requires": { "loader-utils": "^2.0.0" }, diff --git a/ayanova/package.json b/ayanova/package.json index cf5d5609..5a712567 100644 --- a/ayanova/package.json +++ b/ayanova/package.json @@ -22,8 +22,8 @@ "jwt-decode": "^3.1.2", "luxon": "^1.28.0", "marked": "^1.2.9", - "monaco-editor": "^0.22.3", - "monaco-editor-webpack-plugin": "^3.1.0", + "monaco-editor": "^0.30.1", + "monaco-editor-webpack-plugin": "^6.0.0", "nprogress": "^0.2.0", "register-service-worker": "^1.7.2", "vue": "^2.6.14", diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue index e0084fe3..27280ccf 100644 --- a/ayanova/src/views/ay-report-edit.vue +++ b/ayanova/src/views/ay-report-edit.vue @@ -554,12 +554,11 @@ export default { await fetchReportData(vm); //--------------- //setup the editor and models - //https://github.com/microsoft/monaco-editor/issues/2147 monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({ noSemanticValidation: false, noSyntaxValidation: false, noSuggestionDiagnostics: false, - diagnosticCodesToIgnore: [2393] + diagnosticCodesToIgnore: [2393] //this hides a weird error about ayPrepareData being declared more than once which I think is more related to it being barebones in there }); monaco.languages.typescript.javascriptDefaults.setCompilerOptions({ target: monaco.languages.typescript.ScriptTarget.ES6, @@ -578,7 +577,7 @@ export default { "filename/facts.d.ts" ); - //Created editor models for each type of report element that can be edited + //Create editor models for each type of report element that can be edited vm.editData.template.model = monaco.editor.createModel( vm.obj.template,