From 850d835b5793740be598b536461e4c97bb66cb9e Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Thu, 3 Oct 2024 11:07:33 -0400
Subject: [PATCH 01/11] test for staging deploy

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.tsx    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
index 5a0240accf..abe50c2da5 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
@@ -248,14 +248,25 @@ export class OwnerEditor extends React.Component<
     // check if rendering an owner category that lacks any entries
     let isEmptySection = false;
 
-    if (section) {
+    console.log(`itemProps: ${JSON.stringify(itemProps)}`);
+
+    // if any owners uncategorized, set section to null to render an uncategorized owners list
+    Object.keys(itemProps).forEach((key) => {
+      if (!itemProps[key].additionalOwnerInfo.owner_category) {
+        section = null;
+      }
+    });
+
+    if (section !== null) {
       isEmptySection = Object.keys(itemProps).every(
         (key) =>
           itemProps[key].additionalOwnerInfo.owner_category.toLowerCase() !==
-          section.label.toLowerCase()
+          section?.label?.toLowerCase()
       );
     }
 
+    console.log(`isEmptySection: ${isEmptySection}`);
+
     return (
       <ul className="component-list">
         {section ? (

From 35e570833ae8d4b800307012316e7345dd82e8a7 Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Thu, 3 Oct 2024 12:04:20 -0400
Subject: [PATCH 02/11] optional chaining

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.tsx                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
index abe50c2da5..469b978fff 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
@@ -252,7 +252,7 @@ export class OwnerEditor extends React.Component<
 
     // if any owners uncategorized, set section to null to render an uncategorized owners list
     Object.keys(itemProps).forEach((key) => {
-      if (!itemProps[key].additionalOwnerInfo.owner_category) {
+      if (!itemProps[key].additionalOwnerInfo?.owner_category) {
         section = null;
       }
     });

From 7f464b4bdedfe85b4dd21da9f30cbac3cd200c85 Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Thu, 3 Oct 2024 15:15:14 -0400
Subject: [PATCH 03/11] check for uncategorized owners

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.tsx           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
index 469b978fff..adcadd837f 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
@@ -324,8 +324,15 @@ export class OwnerEditor extends React.Component<
 
   renderOwnersList = () => {
     const sections = getOwnersSectionConfig().categories;
+    const { itemProps } = this.state;
 
-    if (sections.length > 0) {
+    if (
+      sections.length > 0 &&
+      // render default way if there are any uncategorized owners
+      Object.keys(itemProps).every((key) => {
+        return itemProps[key].additionalOwnerInfo?.owner_category;
+      })
+    ) {
       return (
         <div>
           {sections.map((section) => this.renderOwnersSection(section))}

From 28ac605b83cc18e7dac325d242d2e9d15b034b8f Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Thu, 3 Oct 2024 17:12:22 -0400
Subject: [PATCH 04/11] logging cleanups

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.tsx                | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
index adcadd837f..ffd35ec239 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
@@ -248,8 +248,6 @@ export class OwnerEditor extends React.Component<
     // check if rendering an owner category that lacks any entries
     let isEmptySection = false;
 
-    console.log(`itemProps: ${JSON.stringify(itemProps)}`);
-
     // if any owners uncategorized, set section to null to render an uncategorized owners list
     Object.keys(itemProps).forEach((key) => {
       if (!itemProps[key].additionalOwnerInfo?.owner_category) {
@@ -265,8 +263,6 @@ export class OwnerEditor extends React.Component<
       );
     }
 
-    console.log(`isEmptySection: ${isEmptySection}`);
-
     return (
       <ul className="component-list">
         {section ? (

From d1970c2af25993a90f9d8cdaab0d6fc8747dcf13 Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Mon, 14 Oct 2024 18:06:54 -0400
Subject: [PATCH 05/11] WIP

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../js/components/OwnerEditor/index.spec.tsx  | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
index a59901e0d5..acfb16ec10 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
@@ -7,10 +7,17 @@ import { mount } from 'enzyme';
 import AvatarLabel from 'components/AvatarLabel';
 
 import { ResourceType } from 'interfaces';
+import { getOwnersSectionConfig } from 'config/config-utils';
 
 import { OwnerEditor, OwnerEditorProps } from '.';
+import { OwnerCategory } from 'interfaces/OwnerCategory';
+// import { renderOwnersSection } from './OwnerEditor';
+import { OwnersSectionConfig } from 'config/config-types';
+
 import * as Constants from './constants';
 
+import * as ConfigUtils from 'config/config-utils';
+
 const setup = (propOverrides?: Partial<OwnerEditorProps>) => {
   const props: OwnerEditorProps = {
     errorText: null,
@@ -74,4 +81,58 @@ describe('OwnerEditor', () => {
       });
     });
   });
+
+  describe('renderOwnersList', () => {
+    it('renders list of owners when categories not configured', () => {
+      const { wrapper } = setup({
+        itemProps: { owner1: {}, owner2: {}, owner3: {} },
+      });
+
+      expect(wrapper.find(AvatarLabel).length).toBe(3);
+    });
+
+    // getOwnersSectionConfig.mockReturnValue({ section: 'mocked config' });
+
+    it('renders owners grouped by category when categories configured', () => {
+      const { wrapper } = setup({
+        itemProps: {
+          owner1: { additionalOwnerInfo: { owner_category: 'label1' } },
+          // owner2: {},
+          // owner3: {},
+        },
+      });
+
+      jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
+        categories: [{ label: 'label1', definition: 'label1 definition' }],
+      });
+
+      console.log(wrapper.debug());
+
+      expect(wrapper.find(AvatarLabel).length).toBe(1);
+      // expect(wrapper.find(AvatarLabel).additionalOwnerInfo).toContain('label1');
+      // expect(wrapper.find('.owner-category-label').text()).toContain('label1');
+    });
+  });
+
+  // describe('renderOwnersList', () => {
+  //   const { wrapper } = setup({
+  //     itemProps: { owner1: {}, owner2: {}, owner3: {} },
+  //   });
+
+  //   jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
+  //     categories: [{ label: 'label1', definition: 'label1 definition' }],
+  //   });
+  // });
+
+  // describe('renderOwnersSection', () => {
+  //   it('renders section for each category', () => {
+  //     const section: OwnerCategory = {
+  //       label: 'label1',
+  //       definition: 'label1 definition',
+  //     };
+  //     const result = renderOwnersSection(section);
+
+  //     expect(result.length).toBe(1);
+  //   });
+  // });
 });

From ddd1137519132d4d33939ef9e1c73be723602701 Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Mon, 21 Oct 2024 13:03:54 -0400
Subject: [PATCH 06/11] tests WIP

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../js/components/OwnerEditor/index.spec.tsx  | 81 ++++++++++---------
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
index acfb16ec10..83312207e0 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
@@ -5,18 +5,13 @@ import * as React from 'react';
 import { mount } from 'enzyme';
 
 import AvatarLabel from 'components/AvatarLabel';
-
 import { ResourceType } from 'interfaces';
-import { getOwnersSectionConfig } from 'config/config-utils';
-
 import { OwnerEditor, OwnerEditorProps } from '.';
-import { OwnerCategory } from 'interfaces/OwnerCategory';
-// import { renderOwnersSection } from './OwnerEditor';
-import { OwnersSectionConfig } from 'config/config-types';
 
 import * as Constants from './constants';
 
 import * as ConfigUtils from 'config/config-utils';
+import InfoButton from 'components/InfoButton';
 
 const setup = (propOverrides?: Partial<OwnerEditorProps>) => {
   const props: OwnerEditorProps = {
@@ -89,50 +84,64 @@ describe('OwnerEditor', () => {
       });
 
       expect(wrapper.find(AvatarLabel).length).toBe(3);
+      expect(wrapper.find(InfoButton).length).toBe(0); // expect no info buttons when owners not configured
     });
 
-    // getOwnersSectionConfig.mockReturnValue({ section: 'mocked config' });
+    it('renders owners when categories configured and present on all owners', () => {
+      jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
+        categories: [
+          { label: 'label1', definition: 'label1 definition' },
+          { label: 'label2', definition: 'label2 definition' },
+        ],
+      });
 
-    it('renders owners grouped by category when categories configured', () => {
       const { wrapper } = setup({
         itemProps: {
           owner1: { additionalOwnerInfo: { owner_category: 'label1' } },
-          // owner2: {},
-          // owner3: {},
+          owner2: { additionalOwnerInfo: { owner_category: 'label1' } },
+          owner3: { additionalOwnerInfo: { owner_category: 'label2' } },
         },
       });
 
+      console.log('====== wrapper debug ======');
+      console.log(`${JSON.stringify(wrapper.debug())}`);
+      console.log(`${JSON.stringify(wrapper.text())}`);
+      console.log(`${JSON.stringify(wrapper.find(AvatarLabel))}`);
+
+      // expect(wrapper.find(AvatarLabel).length).toBe(3);
+      expect(wrapper.find(InfoButton).length).toBe(2); // expect one for each category
+    });
+
+    it('renders owners when categories configured but not present on these owners', () => {
       jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
         categories: [{ label: 'label1', definition: 'label1 definition' }],
       });
 
-      console.log(wrapper.debug());
+      const { wrapper } = setup({
+        itemProps: {
+          owner1: {},
+          owner2: {},
+          owner3: {},
+        },
+      });
 
-      expect(wrapper.find(AvatarLabel).length).toBe(1);
-      // expect(wrapper.find(AvatarLabel).additionalOwnerInfo).toContain('label1');
-      // expect(wrapper.find('.owner-category-label').text()).toContain('label1');
+      expect(wrapper.find(AvatarLabel).length).toBe(3);
     });
-  });
 
-  // describe('renderOwnersList', () => {
-  //   const { wrapper } = setup({
-  //     itemProps: { owner1: {}, owner2: {}, owner3: {} },
-  //   });
-
-  //   jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
-  //     categories: [{ label: 'label1', definition: 'label1 definition' }],
-  //   });
-  // });
-
-  // describe('renderOwnersSection', () => {
-  //   it('renders section for each category', () => {
-  //     const section: OwnerCategory = {
-  //       label: 'label1',
-  //       definition: 'label1 definition',
-  //     };
-  //     const result = renderOwnersSection(section);
-
-  //     expect(result.length).toBe(1);
-  //   });
-  // });
+    it('renders owners without errors when some owners have categories and some do not', () => {
+      jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
+        categories: [{ label: 'label1', definition: 'label1 definition' }],
+      });
+
+      const { wrapper } = setup({
+        itemProps: {
+          owner1: { additionalOwnerInfo: { owner_category: 'label1' } },
+          owner2: {},
+          owner3: {},
+        },
+      });
+
+      expect(wrapper.find(AvatarLabel).length).toBe(3);
+    });
+  });
 });

From 087035374e12d13a9af2325027108108369e40c1 Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Mon, 21 Oct 2024 13:08:51 -0400
Subject: [PATCH 07/11] disable failing test

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.spec.tsx             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
index 83312207e0..d0cf9431d2 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
@@ -87,6 +87,7 @@ describe('OwnerEditor', () => {
       expect(wrapper.find(InfoButton).length).toBe(0); // expect no info buttons when owners not configured
     });
 
+    /*
     it('renders owners when categories configured and present on all owners', () => {
       jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
         categories: [
@@ -111,6 +112,7 @@ describe('OwnerEditor', () => {
       // expect(wrapper.find(AvatarLabel).length).toBe(3);
       expect(wrapper.find(InfoButton).length).toBe(2); // expect one for each category
     });
+    */
 
     it('renders owners when categories configured but not present on these owners', () => {
       jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({

From 4bf441584882f366da80f97b00440dce31ef173d Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Mon, 21 Oct 2024 13:21:30 -0400
Subject: [PATCH 08/11] linter

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.spec.tsx         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
index d0cf9431d2..6df0dd0046 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
@@ -6,12 +6,12 @@ import { mount } from 'enzyme';
 
 import AvatarLabel from 'components/AvatarLabel';
 import { ResourceType } from 'interfaces';
-import { OwnerEditor, OwnerEditorProps } from '.';
-
-import * as Constants from './constants';
 
 import * as ConfigUtils from 'config/config-utils';
 import InfoButton from 'components/InfoButton';
+import { OwnerEditor, OwnerEditorProps } from '.';
+
+import * as Constants from './constants';
 
 const setup = (propOverrides?: Partial<OwnerEditorProps>) => {
   const props: OwnerEditorProps = {

From 2658f8f6bd17d9e51a9dfae876434cd10ed0847f Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Mon, 21 Oct 2024 13:44:04 -0400
Subject: [PATCH 09/11] tests update

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.spec.tsx      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
index 6df0dd0046..a9e18b8dae 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.spec.tsx
@@ -87,7 +87,6 @@ describe('OwnerEditor', () => {
       expect(wrapper.find(InfoButton).length).toBe(0); // expect no info buttons when owners not configured
     });
 
-    /*
     it('renders owners when categories configured and present on all owners', () => {
       jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({
         categories: [
@@ -104,15 +103,9 @@ describe('OwnerEditor', () => {
         },
       });
 
-      console.log('====== wrapper debug ======');
-      console.log(`${JSON.stringify(wrapper.debug())}`);
-      console.log(`${JSON.stringify(wrapper.text())}`);
-      console.log(`${JSON.stringify(wrapper.find(AvatarLabel))}`);
-
-      // expect(wrapper.find(AvatarLabel).length).toBe(3);
+      expect(wrapper.find(AvatarLabel).length).toBe(6); // expect 2 for each owner because InfoButton is rendered
       expect(wrapper.find(InfoButton).length).toBe(2); // expect one for each category
     });
-    */
 
     it('renders owners when categories configured but not present on these owners', () => {
       jest.spyOn(ConfigUtils, 'getOwnersSectionConfig').mockReturnValue({

From ef7af0fc25630a5ba741152751805a3647e8cceb Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Mon, 21 Oct 2024 15:35:24 -0400
Subject: [PATCH 10/11] remove redundant check

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.tsx            | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
index ffd35ec239..b3ebaf09ab 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
@@ -247,14 +247,6 @@ export class OwnerEditor extends React.Component<
 
     // check if rendering an owner category that lacks any entries
     let isEmptySection = false;
-
-    // if any owners uncategorized, set section to null to render an uncategorized owners list
-    Object.keys(itemProps).forEach((key) => {
-      if (!itemProps[key].additionalOwnerInfo?.owner_category) {
-        section = null;
-      }
-    });
-
     if (section !== null) {
       isEmptySection = Object.keys(itemProps).every(
         (key) =>

From 21ac4ef522406784e3f606731d30b01c81f48c14 Mon Sep 17 00:00:00 2001
From: Ben Dye <bdye@lyft.com>
Date: Mon, 21 Oct 2024 15:50:20 -0400
Subject: [PATCH 11/11] linter

Signed-off-by: Ben Dye <bdye@lyft.com>
---
 .../static/js/components/OwnerEditor/index.tsx                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
index b3ebaf09ab..629e83da81 100644
--- a/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
+++ b/frontend/amundsen_application/static/js/components/OwnerEditor/index.tsx
@@ -247,6 +247,7 @@ export class OwnerEditor extends React.Component<
 
     // check if rendering an owner category that lacks any entries
     let isEmptySection = false;
+
     if (section !== null) {
       isEmptySection = Object.keys(itemProps).every(
         (key) =>