diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js index c12e67ae87..05b892f8f6 100644 --- a/apps/remix-ide/src/app/udapp/run-tab.js +++ b/apps/remix-ide/src/app/udapp/run-tab.js @@ -78,7 +78,7 @@ export class RunTab extends ViewPlugin { } sendTransaction (tx) { - _paq.push(['trackEvent', 'udapp', 'sendTx']) + _paq.push(['trackEvent', 'udapp', 'send', 'transaction']) return this.blockchain.sendTransaction(tx) } diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx index bea7384767..c0cbd83ad1 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx @@ -60,7 +60,7 @@ function HomeTabGetStarted ({plugin}: HomeTabGetStartedProps) { await plugin.call('filePanel', 'createWorkspace', templateName + "_" + timeStamp, templateName) await plugin.call('filePanel', 'setWorkspace', templateName + "_" + timeStamp) plugin.verticalIcons.select('filePanel') - _paq.push(['trackEvent', 'homeGetStarted', templateName]) + _paq.push(['trackEvent', 'homeTab', 'homeGetStarted', templateName]) } return ( diff --git a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts index 31ddc10d0f..8f524901f5 100644 --- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts +++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts @@ -26,11 +26,11 @@ const loadContractFromAddress = (plugin: RunTab, address, confirmCb, cb) => { } catch (e) { return cb('Failed to parse the current file as JSON ABI.') } - _paq.push(['trackEvent', 'udapp', 'AtAddressLoadWithABI']) + _paq.push(['trackEvent', 'udapp', 'useAtAddress' , 'AtAddressLoadWithABI']) cb(null, 'abi', abi) }) } else { - _paq.push(['trackEvent', 'udapp', 'AtAddressLoadWithArtifacts']) + _paq.push(['trackEvent', 'udapp', 'useAtAddress', 'AtAddressLoadWithArtifacts']) cb(null, 'instance') } } diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx index f4a4e95f9e..1e3d5ec135 100644 --- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx @@ -267,7 +267,7 @@ export function ContractDropdownUI(props: ContractDropdownProps) { }> diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index a3b9080e50..1ea42d038a 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -473,10 +473,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => { compileIcon.current.classList.remove('remixui_spinningIcon') compileIcon.current.classList.remove('remixui_bouncingIcon') if (!state.autoCompile || (state.autoCompile && state.matomoAutocompileOnce)) { - if (state.useFileConfiguration) - _paq.push(['trackEvent', 'compiler', 'compiled_with_config_file']) - - _paq.push(['trackEvent', 'compiler', 'compiled_with_version', _retrieveVersion()]) + _paq.push(['trackEvent', 'compiler', 'compiled', 'with_config_file_' + state.useFileConfiguration]) + _paq.push(['trackEvent', 'compiler', 'compiled', 'with_version_' + _retrieveVersion()]) if (state.autoCompile && state.matomoAutocompileOnce) { setState(prevState => { return { ...prevState, matomoAutocompileOnce: false } diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts index 10e08f86ed..c8ea120bc3 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -155,7 +155,7 @@ export class CompileTabLogic { ` const configFilePath = 'remix-compiler.config.js' this.api.writeFile(configFilePath, fileContent) - _paq.push(['trackEvent', 'compiler', 'compileWithHardhat']) + _paq.push(['trackEvent', 'compiler', 'runCompile', 'compileWithHardhat']) this.api.compileWithHardhat(configFilePath).then((result) => { this.api.logToTerminal({ type: 'info', value: result }) }).catch((error) => { @@ -181,7 +181,7 @@ export class CompileTabLogic { }` const configFilePath = 'remix-compiler.config.js' this.api.writeFile(configFilePath, fileContent) - _paq.push(['trackEvent', 'compiler', 'compileWithTruffle']) + _paq.push(['trackEvent', 'compiler', 'runCompile', 'compileWithTruffle']) this.api.compileWithTruffle(configFilePath).then((result) => { this.api.logToTerminal({ type: 'info', value: result }) }).catch((error) => { diff --git a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx index 0396ba7932..a188beccd0 100644 --- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx +++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx @@ -588,7 +588,7 @@ export const SolidityUnitTesting = (props: Record) => { // eslint-d const tests: string[] = selectedTests.current if (!tests || !tests.length) return else setProgressBarHidden(false) - _paq.push(['trackEvent', 'solidityUnitTesting', 'runTests']) + _paq.push(['trackEvent', 'solidityUnitTesting', 'runTests', 'nbTestsRunning' + tests.length]) eachOfSeries(tests, (value: string, key: string, callback: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any if (hasBeenStopped.current) return runTest(value, callback) diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx index f10e7baddf..eafad3b92c 100644 --- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx +++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx @@ -215,7 +215,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { const warningErrors = [] // Remix Analysis - _paq.push(['trackEvent', 'solidityStaticAnalyzer', 'analyzeWithRemixAnalyzer']) + _paq.push(['trackEvent', 'solidityStaticAnalyzer', 'analyze', 'remixAnalyzer']) const results = runner.run(lastCompilationResult, categoryIndex) for (const result of results) { let moduleName @@ -281,7 +281,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { const compilerState = await props.analysisModule.call('solidity', 'getCompilerState') const { currentVersion, optimize, evmVersion } = compilerState await props.analysisModule.call('terminal', 'log', { type: 'info', value: '[Slither Analysis]: Running...' }) - _paq.push(['trackEvent', 'solidityStaticAnalyzer', 'analyzeWithSlither']) + _paq.push(['trackEvent', 'solidityStaticAnalyzer', 'analyze', 'slitherAnalyzer']) const result = await props.analysisModule.call('slither', 'analyse', state.file, { currentVersion, optimize, evmVersion }) if (result.status) { props.analysisModule.call('terminal', 'log', { type: 'info', value: `[Slither Analysis]: Analysis Completed!! ${result.count} warnings found.` }) diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx index bf864fda69..ec2bb31b03 100644 --- a/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx +++ b/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx @@ -87,19 +87,19 @@ export const FileExplorerContextMenu = (props: FileExplorerContextMenuProps) => _paq.push(['trackEvent', 'fileExplorer', 'contextMenu', 'delete']) break case 'Push changes to gist': - _paq.push(['trackEvent', 'fileExplorer', 'pushToChangesoGist']) + _paq.push(['trackEvent', 'fileExplorer', 'contextMenu', 'pushToChangesoGist']) pushChangesToGist(path, type) break case 'Publish folder to gist': - _paq.push(['trackEvent', 'fileExplorer', 'publishFolderToGist']) + _paq.push(['trackEvent', 'fileExplorer', 'contextMenu', 'publishFolderToGist']) publishFolderToGist(path, type) break case 'Publish file to gist': - _paq.push(['trackEvent', 'fileExplorer', 'publishFileToGist']) + _paq.push(['trackEvent', 'fileExplorer', 'contextMenu', 'publishFileToGist']) publishFileToGist(path, type) break case 'Run': - _paq.push(['trackEvent', 'fileExplorer', 'runScript']) + _paq.push(['trackEvent', 'fileExplorer', 'contextMenu', 'runScript']) runScript(path) break case 'Copy':