From c53f3c7d604ac55b3dbaf78b5992aa5d7ca08cfc Mon Sep 17 00:00:00 2001
From: Sachin Chaurasiya <sachinchaurasiyachotey87@gmail.com>
Date: Mon, 16 Aug 2021 15:08:58 +0530
Subject: [PATCH] misc fixes (#202)

* misc fixes

* minor changes

* minor fix

* removed commented code
---
 .../components/my-data-details/ManageTab.tsx  |  2 +-
 .../ui/src/pages/database-details/index.tsx   |  6 +++--
 .../ui/src/pages/my-data-details/index.tsx    |  8 +++---
 .../resources/ui/src/pages/my-data/index.tsx  | 25 +++++++++++++------
 .../resources/ui/src/utils/TableUtils.tsx     |  3 +--
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx
index 2d89ebd62b1..2388b0e00e8 100644
--- a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/ManageTab.tsx
@@ -168,7 +168,7 @@ const ManageTab: FunctionComponent<Props> = ({
           <NonAdminAction
             html={
               <>
-                <p>You need ownership to perform this action</p>
+                <p>You need to be owner to perform this action</p>
                 <p>Claim ownership from above </p>
               </>
             }
diff --git a/catalog-rest-service/src/main/resources/ui/src/pages/database-details/index.tsx b/catalog-rest-service/src/main/resources/ui/src/pages/database-details/index.tsx
index cd36531a5a9..5f5d4b2aa98 100644
--- a/catalog-rest-service/src/main/resources/ui/src/pages/database-details/index.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/pages/database-details/index.tsx
@@ -49,7 +49,7 @@ import useToastContext from '../../hooks/useToastContext';
 import { getCurrentUserId, isEven } from '../../utils/CommonUtils';
 import { serviceTypeLogo } from '../../utils/ServiceUtils';
 import SVGIcons from '../../utils/SvgUtils';
-import { getUsagePercentile } from '../../utils/TableUtils';
+import { getOwnerFromId, getUsagePercentile } from '../../utils/TableUtils';
 import { getTableTags } from '../../utils/TagsUtils';
 
 const DatabaseDetails: FunctionComponent = () => {
@@ -308,7 +308,9 @@ const DatabaseDetails: FunctionComponent = () => {
                           )}
                         </td>
                         <td className="tableBody-cell">
-                          <p>{table?.owner?.name || '--'}</p>
+                          <p>
+                            {getOwnerFromId(table?.owner?.id)?.name || '--'}
+                          </p>
                         </td>
                         <td className="tableBody-cell">
                           <p>
diff --git a/catalog-rest-service/src/main/resources/ui/src/pages/my-data-details/index.tsx b/catalog-rest-service/src/main/resources/ui/src/pages/my-data-details/index.tsx
index f4229226658..93d4da7a2a6 100644
--- a/catalog-rest-service/src/main/resources/ui/src/pages/my-data-details/index.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/pages/my-data-details/index.tsx
@@ -23,7 +23,6 @@ import { observer } from 'mobx-react';
 import { ColumnTags, TableColumn, TableDetail, TableJoinsData } from 'Models';
 import React, { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import AppState from '../../AppState';
 import { getDatabase } from '../../axiosAPIs/databaseAPI';
 import { postFeed } from '../../axiosAPIs/feedsAPI';
 import { getServiceById } from '../../axiosAPIs/serviceAPI';
@@ -56,6 +55,7 @@ import {
   getCurrentUserId,
   getPartialNameFromFQN,
   getTableFQNFromColumnFQN,
+  getUserTeams,
 } from '../../utils/CommonUtils';
 import { serviceTypeLogo } from '../../utils/ServiceUtils';
 import SVGIcons from '../../utils/SvgUtils';
@@ -184,7 +184,7 @@ const MyDataDetailsPage = () => {
     if (owner?.type === 'user') {
       return owner.id === getCurrentUserId();
     } else {
-      return AppState.userTeams.some((team) => team.id === owner?.id);
+      return getUserTeams().some((team) => team.id === owner?.id);
     }
   };
 
@@ -450,7 +450,7 @@ const MyDataDetailsPage = () => {
               </button>
               <NonAdminAction
                 isOwner={!owner || hasEditAccess()}
-                title="You need ownership to perform this action">
+                title="You need to be owner to perform this action">
                 <button
                   className={getTabClasses(6, activeTab)}
                   data-testid="tab"
@@ -474,7 +474,7 @@ const MyDataDetailsPage = () => {
                         <NonAdminAction
                           html={
                             <>
-                              <p>You need ownership to perform this action</p>
+                              <p>You need to be owner to perform this action</p>
                               {!owner ? (
                                 <p>Claim ownership in Manage </p>
                               ) : null}
diff --git a/catalog-rest-service/src/main/resources/ui/src/pages/my-data/index.tsx b/catalog-rest-service/src/main/resources/ui/src/pages/my-data/index.tsx
index b5c66005892..a96cb97f7d6 100644
--- a/catalog-rest-service/src/main/resources/ui/src/pages/my-data/index.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/pages/my-data/index.tsx
@@ -16,8 +16,10 @@
 */
 
 import { AxiosError } from 'axios';
+import { observer } from 'mobx-react';
 import { FormatedTableData, SearchResponse } from 'Models';
 import React, { useEffect, useRef, useState } from 'react';
+import AppState from '../../AppState';
 import { searchData } from '../../axiosAPIs/miscAPI';
 import Error from '../../components/common/error/Error';
 import Loader from '../../components/Loader/Loader';
@@ -41,21 +43,28 @@ const MyDataPage: React.FC = (): React.ReactElement => {
   const [filter, setFilter] = useState<string>('');
   const [countServices, setCountServices] = useState<number>(0);
   const [countAssets, setCountAssets] = useState<number>(0);
-
   const isMounted = useRef<boolean>(false);
 
   const getActiveTabClass = (tab: number) => {
     return tab === currentTab ? 'active' : '';
   };
 
+  const getFilters = (): string => {
+    if (filter === 'owner') {
+      const ownerIds = [
+        ...AppState.userDetails.teams.map((team) => `${filter}:${team.id}`),
+        `${filter}:${getCurrentUserId()}`,
+      ];
+
+      return `(${ownerIds.join(' OR ')})`;
+    }
+
+    return `${filter}:${getCurrentUserId()}`;
+  };
+
   const fetchTableData = (setAssetCount = false) => {
     setIsLoading(true);
-    searchData(
-      '',
-      currentPage,
-      PAGE_SIZE,
-      filter ? `${filter}:${getCurrentUserId()}` : ''
-    )
+    searchData('', currentPage, PAGE_SIZE, filter ? getFilters() : '')
       .then((res: SearchResponse) => {
         const hits = res.data.hits.hits;
         const total = res.data.hits.total.value;
@@ -166,4 +175,4 @@ const MyDataPage: React.FC = (): React.ReactElement => {
   );
 };
 
-export default MyDataPage;
+export default observer(MyDataPage);
diff --git a/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx b/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx
index 5c3e236a07e..c2ddd2f646c 100644
--- a/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import AppState from '../AppState';
 import PopOver from '../components/common/popover/PopOver';
 import { ConstraintTypes } from '../enums/table.enum';
-import { getUserTeams } from './CommonUtils';
 import { ordinalize } from './StringsUtils';
 import SVGIcons from './SvgUtils';
 
@@ -90,7 +89,7 @@ export const getOwnerFromId = (
         type: 'user',
       };
     } else {
-      const team = getUserTeams().find((item) => item.id === id);
+      const team = AppState.userTeams.find((item) => item.id === id);
       if (team) {
         retVal = {
           name: team.displayName || team.name,