feat(content-insights): add content type filter for Needs Update metric [INTEG-4147]

apps/content-insights/src/components/Dashboard.tsx

@@ -49,6 +49,7 @@ const Dashboard = () => {
 
   const metricsCalculator = new MetricsCalculator(entries, scheduledActions, {
     needsUpdateMonths: installation.needsUpdateMonths,
+    needsUpdateContentTypes: installation.needsUpdateContentTypes,
     recentlyPublishedDays: installation.recentlyPublishedDays,
     timeToPublishDays: installation.timeToPublishDays,
   });

apps/content-insights/src/hooks/useNeedsUpdateContent.ts

@@ -40,8 +40,9 @@ export function useNeedsUpdate(
   contentTypes: Map<string, ContentTypeProps>
 ): UseNeedsUpdateResult {
   const sdk = useSDK<HomeAppSDK | PageAppSDK>();
-  const needsUpdateMonths =
-    ((sdk.parameters.installation ?? {}) as AppInstallationParameters).needsUpdateMonths ?? 6;
+  const installation = (sdk.parameters.installation ?? {}) as AppInstallationParameters;
+  const needsUpdateMonths = installation.needsUpdateMonths ?? 6;
+  const needsUpdateContentTypes = installation.needsUpdateContentTypes ?? [];
   const defaultLocale = sdk.locales.default;
 
   const filteredEntries = useMemo(
@@ -50,10 +51,16 @@ export function useNeedsUpdate(
         const updatedAt = parseDate(entry?.sys?.updatedAt);
         if (!updatedAt) return false;
         const thresholdDate = subMonths(new Date(), needsUpdateMonths);
+        if (updatedAt.getTime() >= thresholdDate.getTime()) return false;
 
-        return updatedAt.getTime() < thresholdDate.getTime();
+        if (needsUpdateContentTypes.length > 0) {
+          const contentTypeId = entry.sys.contentType?.sys?.id;
+          if (!contentTypeId || !needsUpdateContentTypes.includes(contentTypeId)) return false;
+        }
+
+        return true;
       }),
-    [entries, needsUpdateMonths]
+    [entries, needsUpdateMonths, needsUpdateContentTypes]
   );
 
   const userIds = getUniqueUserIdsFromEntries(filteredEntries);

apps/content-insights/src/locations/ConfigScreen.tsx

@@ -30,6 +30,7 @@ import TextInputInteger from '../components/TextInputInteger';
 
 export interface AppInstallationParameters {
   defaultContentTypes?: string[];
+  needsUpdateContentTypes?: string[];
   needsUpdateMonths?: number;
   recentlyPublishedDays?: number;
   showUpcomingReleases?: boolean;
@@ -40,6 +41,7 @@ export interface AppInstallationParameters {
 const ConfigScreen = () => {
   const [parameters, setParameters] = useState<AppInstallationParameters>({});
   const [selectedContentTypes, setSelectedContentTypes] = useState<ContentType[]>([]);
+  const [needsUpdateContentTypes, setNeedsUpdateContentTypes] = useState<ContentType[]>([]);
   const sdk = useSDK<ConfigAppSDK>();
 
   const [errors, setErrors] = useState<Record<string, string>>({});
@@ -86,10 +88,11 @@ const ConfigScreen = () => {
       parameters: {
         ...parameters,
         defaultContentTypes: selectedContentTypes.map((ct) => ct.id),
+        needsUpdateContentTypes: needsUpdateContentTypes.map((ct) => ct.id),
       },
       targetState: currentState,
     };
-  }, [parameters, selectedContentTypes, sdk]);
+  }, [parameters, selectedContentTypes, needsUpdateContentTypes, sdk]);
 
   useEffect(() => {
     sdk.app.onConfigure(() => onConfigure());
@@ -181,6 +184,22 @@ const ConfigScreen = () => {
               </FormControl.HelpText>
             </FormControl>
 
+            <FormControl marginBottom="spacingL">
+              <FormControl.Label>
+                Content types included in &quot;Needs update&quot;
+              </FormControl.Label>
+              <ContentTypeMultiSelect
+                selectedContentTypes={needsUpdateContentTypes}
+                setSelectedContentTypes={setNeedsUpdateContentTypes}
+                sdk={sdk}
+                initialSelectedIds={parameters.needsUpdateContentTypes}
+              />
+              <FormControl.HelpText>
+                Only entries of the selected content types will count toward the &quot;Needs
+                update&quot; metric. Leave empty to include all content types.
+              </FormControl.HelpText>
+            </FormControl>
+
             <FormControl
               marginBottom="spacingL"
               isRequired

apps/content-insights/src/metrics/MetricsCalculator.ts

@@ -12,6 +12,7 @@ export class MetricsCalculator {
   private readonly scheduledActions: ReadonlyArray<ScheduledActionProps>;
   private readonly now: Date; // to maintain all the metrics consistent at the same current time
   private readonly needsUpdateMonths: number;
+  private readonly needsUpdateContentTypes: readonly string[];
   private readonly recentlyPublishedDays: number;
   private readonly timeToPublishDays: number;
 
@@ -20,6 +21,7 @@ export class MetricsCalculator {
     scheduledActions: ReadonlyArray<ScheduledActionProps>,
     options?: {
       needsUpdateMonths?: number;
+      needsUpdateContentTypes?: string[];
       recentlyPublishedDays?: number;
       timeToPublishDays?: number;
     }
@@ -28,6 +30,7 @@ export class MetricsCalculator {
     this.scheduledActions = scheduledActions;
     this.now = new Date();
     this.needsUpdateMonths = options?.needsUpdateMonths ?? NEEDS_UPDATE_MONTHS_RANGE.min;
+    this.needsUpdateContentTypes = options?.needsUpdateContentTypes ?? [];
     this.recentlyPublishedDays =
       options?.recentlyPublishedDays ?? RECENTLY_PUBLISHED_DAYS_RANGE.min;
     this.timeToPublishDays = options?.timeToPublishDays ?? TIME_TO_PUBLISH_DAYS_RANGE.min;
@@ -167,9 +170,14 @@ export class MetricsCalculator {
     for (const entry of this.entries) {
       const updatedAt = parseDate(entry?.sys?.updatedAt);
       if (!updatedAt) continue;
-      if (updatedAt.getTime() < cutoff.getTime()) {
-        count += 1;
+      if (updatedAt.getTime() >= cutoff.getTime()) continue;
+
+      if (this.needsUpdateContentTypes.length > 0) {
+        const contentTypeId = entry.sys.contentType?.sys?.id;
+        if (!contentTypeId || !this.needsUpdateContentTypes.includes(contentTypeId)) continue;
       }
+
+      count += 1;
     }
 
     return {

apps/content-insights/test/locations/ConfigScreen.spec.tsx

@@ -235,6 +235,7 @@ describe('Config Screen component', () => {
         timeToPublishDays: TIME_TO_PUBLISH_DAYS_RANGE.min,
         showUpcomingReleases: true,
         defaultContentTypes: [],
+        needsUpdateContentTypes: [],
       },
       targetState: {},
     });

apps/content-insights/test/metrics/MetricsCalculator.spec.ts

@@ -254,5 +254,61 @@ describe('MetricsCalculator', () => {
 
       expect(metric?.value).toBe('1');
     });
+
+    it('filters by content type when needsUpdateContentTypes is set', () => {
+      const entries: EntryProps[] = [
+        {
+          sys: {
+            updatedAt: daysAgo(200),
+            contentType: { sys: { id: 'blogPost' } },
+          },
+        } as unknown as EntryProps,
+        {
+          sys: {
+            updatedAt: daysAgo(200),
+            contentType: { sys: { id: 'navigationItem' } },
+          },
+        } as unknown as EntryProps,
+        {
+          sys: {
+            updatedAt: daysAgo(200),
+            contentType: { sys: { id: 'blogPost' } },
+          },
+        } as unknown as EntryProps,
+      ];
+
+      const calculator = new MetricsCalculator(entries, [], {
+        needsUpdateMonths: 6,
+        needsUpdateContentTypes: ['blogPost'],
+      });
+      const metric = calculator.getAllMetrics().find((m) => m.title === 'Needs update');
+
+      expect(metric?.value).toBe('2');
+    });
+
+    it('includes all content types when needsUpdateContentTypes is empty', () => {
+      const entries: EntryProps[] = [
+        {
+          sys: {
+            updatedAt: daysAgo(200),
+            contentType: { sys: { id: 'blogPost' } },
+          },
+        } as unknown as EntryProps,
+        {
+          sys: {
+            updatedAt: daysAgo(200),
+            contentType: { sys: { id: 'navigationItem' } },
+          },
+        } as unknown as EntryProps,
+      ];
+
+      const calculator = new MetricsCalculator(entries, [], {
+        needsUpdateMonths: 6,
+        needsUpdateContentTypes: [],
+      });
+      const metric = calculator.getAllMetrics().find((m) => m.title === 'Needs update');
+
+      expect(metric?.value).toBe('2');
+    });
   });
 });