Revert "Fix prepare release notes for Endpoint (#31)"

This reverts commit 7416954.
elastic · Oct 23, 2024 · 871c77e · 871c77e
1 parent 7416954
commit 871c77e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/common/pr-utils/grouping.ts b/src/common/pr-utils/grouping.ts
@@ -1,5 +1,5 @@
 import { PrItem } from '../../common';
-import { Config, AreaDefinition } from '../../config';
+import { Config } from '../../config';
 
 export interface ReleaseNoteGroups<T> {
   fixes: T;
@@ -21,14 +21,9 @@ export function groupByArea(prs: PrItem[], { areas }: Config): GroupedByArea {
   // TODO: How to handle/track PRs in multiple areas.
   const grouped = prs.reduce<{ unknown: PrItem[]; areas: { [title: string]: PrItem[] } }>(
     (grouped, pr) => {
-      let matchingAreas: AreaDefinition[] = [];
-      if (!areas || areas.length === 0) {
-        matchingAreas = [{ title: '', labels: [] }];
-      } else {
-        matchingAreas = areas.filter(
-          ({ labels }) => labels && pr.labels.some(({ name }) => name && labels.includes(name))
-        );
-      }
+      const matchingAreas = areas.filter(
+        ({ labels }) => labels && pr.labels.some(({ name }) => name && labels.includes(name))
+      );
 
       if (matchingAreas.length === 0) {
         grouped.unknown.push(pr);

diff --git a/src/config/index.ts b/src/config/index.ts
@@ -1,2 +1,2 @@
 export * from './config';
-export type { TemplateId, Config, AreaDefinition } from './templates';
+export type { TemplateId, Config } from './templates';
diff --git a/src/config/templates/endpoint.ts b/src/config/templates/endpoint.ts
@@ -3,7 +3,11 @@ import type { Config } from './types';
 export const endpointTemplate: Config = {
   repoName: 'endpoint-dev',
   excludedLabels: ['backport', 'release_note:skip'],
-  areas: [],
+  areas: [
+    {
+      title: 'Elastic Endpoint',
+    },
+  ],
   templates: {
     pages: {
       releaseNotes: `[discrete]

diff --git a/src/config/templates/types.ts b/src/config/templates/types.ts
@@ -1,4 +1,4 @@
-export interface AreaDefinition {
+interface AreaDefinition {
   title: string;
   labels?: readonly string[];
   /**

diff --git a/src/pages/release-notes/components/grouped-pr-list.tsx b/src/pages/release-notes/components/grouped-pr-list.tsx
@@ -11,7 +11,7 @@ interface Props {
 
 export const GroupedPrList: FC<Props> = memo(({ groupedPrs, groups, keyPrefix }) => {
   const sortedGroups = useMemo(
-    () => (groups ? [...groups].sort((a, b) => a.title.localeCompare(b.title)) : [{ title: '' }]),
+    () => [...groups].sort((a, b) => a.title.localeCompare(b.title)),
     [groups]
   );
   return (