Merge pull request #6478 from remix-project-org/matomo-cleanup

Correct workspace matomo events

Author: ioedeveloper

libs/remix-api/src/lib/plugins/matomo/events/file-events.ts

@@ -24,8 +24,8 @@ export interface WorkspaceEvent extends MatomoEventBase {
   category: 'Workspace';
   action: 
     | 'switchWorkspace'
-    | 'GIT'
-    | 'createWorkspace';
+    | 'template'
+    | 'GIT';
 }
 
 export interface StorageEvent extends MatomoEventBase {

libs/remix-ui/top-bar/src/lib/remix-ui-topbar.tsx

@@ -292,7 +292,7 @@ export function RemixUiTopbar() {
 
   const loginWithGitHub = async () => {
     global.plugin.call('dgit', 'login')
-    trackMatomoEvent({ category: 'topbar', action: 'header', name: 'Settings', isClick: true })
+    trackMatomoEvent({ category: 'topbar', action: 'GIT', name: 'login', isClick: true })
   }
 
   const logOutOfGithub = async () => {

libs/remix-ui/workspace/src/lib/actions/workspace.ts

@@ -239,12 +239,10 @@ export const populateWorkspace = async (
   if (workspaceTemplateName === 'semaphore' || workspaceTemplateName === 'hashchecker' || workspaceTemplateName === 'rln') {
     const isCircomActive = await plugin.call('manager', 'isActive', 'circuit-compiler')
     if (!isCircomActive) await plugin.call('manager', 'activatePlugin', 'circuit-compiler')
-    await trackMatomoEventAsync(plugin, { category: 'compiler', action: 'compiled', name: workspaceTemplateName, isClick: false })
   }
   if (workspaceTemplateName === 'multNr' || workspaceTemplateName === 'stealthDropNr') {
     const isNoirActive = await plugin.call('manager', 'isActive', 'noir-compiler')
     if (!isNoirActive) await plugin.call('manager', 'activatePlugin', 'noir-compiler')
-    await trackMatomoEventAsync(plugin, { category: 'compiler', action: 'compiled', name: workspaceTemplateName, isClick: false })
   }
 }
 
@@ -301,15 +299,15 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
       let content
 
       if (params.code) {
-        await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'switchWorkspace', name: 'code-template-code-param', isClick: false })
+        await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'template', name: 'code-template-code-param', isClick: false })
         const hashed = bytesToHex(hash.keccakFromString(params.code))
 
         path = 'contract-' + hashed.replace('0x', '').substring(0, 10) + (params.language && params.language.toLowerCase() === 'yul' ? '.yul' : '.sol')
         content = decodePercentEscapedBase64(params.code)
         await workspaceProvider.set(path, content)
       }
       if (params.shareCode) {
-        await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'switchWorkspace', name: 'code-template-shareCode-param', isClick: false })
+        await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'template', name: 'code-template-shareCode-param', isClick: false })
         const host = '127.0.0.1'
         const port = 5001
         const protocol = 'http'
@@ -334,7 +332,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
         await workspaceProvider.set(path, content)
       }
       if (params.url) {
-        await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'switchWorkspace', name: 'code-template-url-param', isClick: false })
+        await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'template', name: 'code-template-url-param', isClick: false })
         const data = await plugin.call('contentImport', 'resolve', params.url)
         path = data.cleanUrl
         content = data.content
@@ -358,7 +356,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
       }
       if (params.ghfolder) {
         try {
-          await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'switchWorkspace', name: 'code-template-ghfolder-param', isClick: false })
+          await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'template', name: 'code-template-ghfolder-param', isClick: false })
           const files = await plugin.call('contentImport', 'resolveGithubFolder', params.ghfolder)
           for (const [path, content] of Object.entries(files)) {
             await workspaceProvider.set(path, content)
@@ -377,7 +375,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
   case 'gist-template':
     // creates a new workspace gist-sample and get the file from gist
     try {
-      await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'switchWorkspace', name: 'gist-template', isClick: false })
+      await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'template', name: 'gist-template', isClick: false })
       const gistId = params.gist
       const response: AxiosResponse = await axios.get(`https://api.github.com/gists/${gistId}`)
       const data = response.data as { files: any }
@@ -440,7 +438,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
       const templateList = Object.keys(templateWithContent)
       if (!templateList.includes(template)) break
 
-      await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'switchWorkspace', name: template, isClick: false })
+      await trackMatomoEventAsync(plugin, { category: 'Workspace', action: 'template', name: template, isClick: false })
       // @ts-ignore
       const files = await templateWithContent[template](opts, plugin)
       for (const file in files) {