Merge pull request #1735 from iamfaran/feat/app-usage-new-params

raheeliftikhar5 · web-flow · commit a760cc7a65b3 · 2025-06-02T11:17:23.000-07:00
Add appAuthorId and appAuthorOrgId for app-usage
diff --git a/client/packages/lowcoder/src/pages/setting/appUsage/dashboard.tsx b/client/packages/lowcoder/src/pages/setting/appUsage/dashboard.tsx
@@ -59,6 +59,8 @@ export function AppUsageDashboard() {
     isAnonymous: boolean;
     details: Record<string, any>;
     geolocationDataJsonb?: Record<string, any>,
+    applicationAuthor?: string;
+    applicationAuthorOrgId?: string;
   };
 
   const currentUser = useSelector(getUser);
@@ -253,13 +255,17 @@ export function AppUsageDashboard() {
       const orgId = e.orgId;
       const appId = e.appId;
       const name = e.details?.applicationName ?? 'Unknown';
-      acc[appId] = acc[appId] || { appId, name, orgId, environmentId, count: 0 };
+      const applicationAuthor = e.applicationAuthor;
+      const applicationAuthorOrgId = e.applicationAuthorOrgId;
+      acc[appId] = acc[appId] || { appId, name, orgId, environmentId, applicationAuthor, applicationAuthorOrgId, count: 0 };
       acc[appId].count++;
       return acc;
     }, {} as Record<string, {
       appId: string, name: string,
       orgId: string,
       environmentId: string,
+      applicationAuthor?: string,
+      applicationAuthorOrgId?: string,
       count: number
     }>);
   }, [allLogs]);
@@ -352,6 +358,22 @@ export function AppUsageDashboard() {
         <a onClick={() => handleClickFilter("environmentId", text)}>{dataMap[text] ?? text}</a>
       ),
     },
+    {
+      title: "App Author",
+      dataIndex: "applicationAuthor",
+      key: "applicationAuthor",
+      render: (text: string) => (
+        text ? <a onClick={() => handleClickFilter("appAuthor", text)}>{text}</a> : '-'
+      ),
+    },
+    {
+      title: "App Author Org ID",
+      dataIndex: "applicationAuthorOrgId",
+      key: "applicationAuthorOrgId",
+      render: (text: string) => (
+        text ? <a onClick={() => handleClickFilter("appAuthorOrgId", text)}>{dataMap[text] ?? text}</a> : '-'
+      ),
+    },
     {
       title: "Total Views",
       dataIndex: "count",
@@ -380,7 +402,7 @@ export function AppUsageDashboard() {
                 const key = Object.keys(changedValue)[0];
                 if (key === "dateRange") {
                   handleDateChange(changedValue.dateRange);
-                } else if (["environmentId", "orgId", "userId", "appId"].includes(key)) {
+                } else if (["environmentId", "orgId", "userId", "appId", "appAuthor", "appAuthorOrgId"].includes(key)) {
                   handleInputChange(); // Debounced input change
                 } else {
                   // Avoid calling fetchLogs if `handleDateChange` already did
@@ -421,6 +443,15 @@ export function AppUsageDashboard() {
                     <Input placeholder="App ID" allowClear />
                   </Form.Item>
                 </Flex>
+                
+                <Flex>
+                  <Form.Item name="appAuthor">
+                    <Input placeholder="App Author" allowClear />
+                  </Form.Item>
+                  <Form.Item name="appAuthorOrgId">
+                    <Input placeholder="App Author Org ID" allowClear />
+                  </Form.Item>
+                </Flex>
               </Flex>
             </Form>
           </Card>
