fix(adoption-insights): remove unwanted columns and add techdocs type (#497)

Author: karthikjeeyar

workspaces/adoption-insights/plugins/adoption-insights-backend/src/database/adapters/BaseAdapter.ts

@@ -207,7 +207,6 @@ export abstract class BaseDatabaseAdapter implements EventDatabase {
     const db = this.db;
     const query = db('events')
       .select(
-        db.raw(`context->>'routeRef' AS entityref`),
         db.raw('CAST(COUNT(*) as INTEGER) AS count'),
         db.raw(this.getLastUsedDate()),
         db.raw(`COALESCE(attributes->>'kind', '') AS kind`),
@@ -219,7 +218,7 @@ export abstract class BaseDatabaseAdapter implements EventDatabase {
         plugin_id: 'techdocs',
       })
       .whereBetween('created_at', [start_date, end_date])
-      .groupByRaw(`entityref, name, kind, namespace`)
+      .groupByRaw(`name, kind, namespace`)
       .limit(Number(limit) || 3);
 
     return query.then(data => this.getResponseData(data, 'last_used'));

workspaces/adoption-insights/plugins/adoption-insights-backend/src/types/event.ts

@@ -41,6 +41,13 @@ interface EntityRefCount {
   count: string;
   last_used: string;
 }
+interface TechDocsCount {
+  kind: string;
+  name: string;
+  namespace: string;
+  count: string;
+  last_used: string;
+}
 
 interface CatalogEntityCount {
   plugin_id: string;
@@ -64,6 +71,6 @@ export type DailyUsers = ResponseWithGrouping<DailyUser[]>;
 export type TotalUsers = ResponseData<TotalUser[]>;
 export type TopSearches = ResponseData<DateCount[]>;
 export type TopPluginCount = ResponseWithGrouping<PluginCount[]>;
-export type TopTechDocsCount = ResponseData<EntityRefCount[]>;
+export type TopTechDocsCount = ResponseData<TechDocsCount[]>;
 export type TopTemplatesCount = ResponseData<EntityRefCount[]>;
 export type TopCatalogEntitiesCount = ResponseData<CatalogEntityCount[]>;