feat: show the count when you click on a selected resource

Author: mariusAsaTNG

src/ElectronBackend/api/__tests__/queries.test.ts

@@ -48,6 +48,99 @@ describe('searchResources', () => {
   });
 });
 
+describe('resourceDescendantCount', () => {
+  beforeEach(async () => {
+    await initializeDb({
+      metadata: { projectId: '', fileCreationDate: '' },
+      resources: pathsToResources(['/parent/target/child', '/parent/sibling']),
+      config: { classifications: {} },
+      manualAttributions: {
+        attributions: {},
+        resourcesToAttributions: {},
+        attributionsToResources: {},
+      },
+      externalAttributions: {
+        attributions: {
+          'attr-target': { id: 'attr-target', criticality: 0 },
+          'attr-child': { id: 'attr-child', criticality: 0 },
+        },
+        resourcesToAttributions: {
+          '/parent/target': ['attr-target'],
+          '/parent/target/child': ['attr-child'],
+        },
+        attributionsToResources: {
+          'attr-target': ['/parent/target'],
+          'attr-child': ['/parent/target/child'],
+        },
+      },
+      frequentLicenses: { nameOrder: [], texts: {} },
+      resolvedExternalAttributions: new Set(),
+      attributionBreakpoints: new Set(),
+      filesWithChildren: new Set(),
+      baseUrlsForSources: {},
+      externalAttributionSources: {},
+    });
+  });
+
+  it('counts the resource itself and all its descendants', async () => {
+    const { result } = await queries.resourceDescendantCount({
+      searchString: '',
+      resourcePath: '/parent/target',
+    });
+
+    expect(result).toBe(2);
+  });
+
+  it('filters descendants by search string', async () => {
+    const { result } = await queries.resourceDescendantCount({
+      searchString: 'child',
+      resourcePath: '/parent/target',
+    });
+
+    expect(result).toBe(1);
+  });
+
+  it('filters descendants to those with a given attribution', async () => {
+    const { result } = await queries.resourceDescendantCount({
+      searchString: '',
+      resourcePath: '/parent/target',
+      onAttributions: ['attr-target'],
+    });
+
+    expect(result).toBe(1);
+  });
+
+  it('counts all resources matching any of the given attributions', async () => {
+    const { result } = await queries.resourceDescendantCount({
+      searchString: '',
+      resourcePath: '/parent/target',
+      onAttributions: ['attr-target', 'attr-child'],
+    });
+
+    expect(result).toBe(2);
+  });
+
+  it('returns 0 when no descendants match the given attributions', async () => {
+    const { result } = await queries.resourceDescendantCount({
+      searchString: '',
+      resourcePath: '/parent/target',
+      onAttributions: ['non-existent'],
+    });
+
+    expect(result).toBe(0);
+  });
+
+  it('applies searchString and onAttributions as a combined filter', async () => {
+    const { result } = await queries.resourceDescendantCount({
+      searchString: 'child',
+      resourcePath: '/parent/target',
+      onAttributions: ['attr-target'],
+    });
+
+    expect(result).toBe(0);
+  });
+});
+
 describe('filterCounts', () => {
   async function setupDb(options?: { resolved?: Array<string> }) {
     await initializeDb({

src/ElectronBackend/api/queries.ts

@@ -47,6 +47,37 @@ export const queries = {
     return { result: result.map((r) => r.path) };
   },
 
+  async resourceDescendantCount(props: {
+    searchString: string;
+    resourcePath: string;
+    onAttributions?: Array<string>;
+  }) {
+    const db = getDb();
+    const resource = await getResourceOrThrow(db, props.resourcePath);
+    let query = getDb()
+      .selectFrom('resource')
+      .select((eb) => eb.fn.countAll<number>().as('total'))
+      .where('id', '>=', resource.id)
+      .where('id', '<=', resource.max_descendant_id)
+      .where('path', 'like', `%${props.searchString}%`);
+    if (props.onAttributions !== undefined) {
+      const onAttributions = props.onAttributions;
+      query = query.where((eb) =>
+        eb(
+          'id',
+          'in',
+          eb
+            .selectFrom('resource_to_attribution')
+            .select('resource_id')
+            .where('attribution_uuid', 'in', onAttributions),
+        ),
+      );
+    }
+    const result = await query.executeTakeFirstOrThrow();
+
+    return { result: result.total };
+  },
+
   async getAttributionData(props: { attributionUuid: string }) {
     const result = await getDb()
       .selectFrom('attribution')

src/ElectronBackend/api/utils.ts

@@ -6,6 +6,7 @@ import {
   CaseWhenBuilder,
   ExpressionBuilder,
   expressionBuilder,
+  Kysely,
   sql,
   Transaction,
 } from 'kysely';
@@ -134,7 +135,7 @@ export function removeTrailingSlash(path: string) {
 }
 
 export async function getResourceOrThrow(
-  trx: Transaction<DB>,
+  trx: Kysely<DB>,
   resourcePath: string,
 ) {
   const strippedResourcePath = removeTrailingSlash(resourcePath);

src/Frontend/Components/ResourceBrowser/ResourceBrowser.tsx

@@ -8,7 +8,11 @@ import { useCallback, useMemo } from 'react';
 import { AllowedFrontendChannels } from '../../../shared/ipc-channels';
 import { text } from '../../../shared/text';
 import { useAppSelector } from '../../state/hooks';
-import { getResourceIdsOfSelectedAttribution } from '../../state/selectors/resource-selectors';
+import {
+  getResourceIdsOfSelectedAttribution,
+  getSelectedAttributionId,
+  getSelectedResourceId,
+} from '../../state/selectors/resource-selectors';
 import { useIsSelectedAttributionVisible } from '../../state/variables/use-filtered-data';
 import { usePanelSizes } from '../../state/variables/use-panel-sizes';
 import { useVariable } from '../../state/variables/use-variable';
@@ -42,6 +46,13 @@ export function ResourceBrowser() {
       { searchString: debouncedSearchAll },
       { placeholderData: keepPreviousData },
     ).data ?? [];
+  const selectedResourceId = useAppSelector(getSelectedResourceId);
+  const selectedCount: number =
+    backend.resourceDescendantCount.useQuery(
+      { searchString: debouncedSearchAll, resourcePath: selectedResourceId },
+      { placeholderData: keepPreviousData },
+    ).data ?? 0;
+
   const linkedResourcesFiltered = useMemo(
     () =>
       isSelectedAttributionVisible
@@ -56,6 +67,17 @@ export function ResourceBrowser() {
     ],
   );
 
+  const selectedAttributionId = useAppSelector(getSelectedAttributionId);
+  const selectedLinkedCount: number =
+    backend.resourceDescendantCount.useQuery(
+      {
+        searchString: debouncedSearchLinked,
+        resourcePath: selectedResourceId,
+        onAttributions: [selectedAttributionId],
+      },
+      { placeholderData: keepPreviousData },
+    ).data ?? 0;
+
   const setWidth = useCallback(
     (width: number) => setPanelSizes({ resourceBrowserWidth: width }),
     [setPanelSizes],
@@ -82,7 +104,10 @@ export function ResourceBrowser() {
       setWidth={setWidth}
       setHeight={setHeight}
       upperPanel={{
-        title: text.resourceBrowser.allResources(allResourcesFiltered.length),
+        title: text.resourceBrowser.allResources(
+          selectedCount,
+          allResourcesFiltered.length,
+        ),
         search: {
           value: searchAll,
           setValue: setSearchAll,
@@ -93,6 +118,7 @@ export function ResourceBrowser() {
       }}
       lowerPanel={{
         title: text.resourceBrowser.linkedResources(
+          selectedLinkedCount,
           linkedResourcesFiltered.length,
         ),
         search: {

src/shared/text.ts

@@ -227,10 +227,10 @@ export const text = {
     discard: 'Discard and Proceed',
   },
   resourceBrowser: {
-    allResources: (count: number) =>
-      `All Resources (${new Intl.NumberFormat().format(count)})`,
-    linkedResources: (count: number) =>
-      `Linked Resources (${new Intl.NumberFormat().format(count)})`,
+    allResources: (selectedResources: number, totalCount: number) =>
+      `Resources (${new Intl.NumberFormat().format(selectedResources)} / ${new Intl.NumberFormat().format(totalCount)})`,
+    linkedResources: (selectedResources: number, totalCount: number) =>
+      `Linked Resources (${new Intl.NumberFormat().format(selectedResources)} / ${new Intl.NumberFormat().format(totalCount)})`,
     hasHighlyCriticalSignals: 'Has highly critical signals',
     hasMediumCriticalSignals: 'Has medium critical signals',
     hasSignals: 'Has signals',