fix merge conflicts

opendatadiscovery · Jan 19, 2024 · dfca26e · dfca26e
1 parent 687a15a
commit dfca26e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/odd-platform-ui/src/components/DataModelling/QueryExampleSearchResults/QueryExamplesList.tsx b/odd-platform-ui/src/components/DataModelling/QueryExampleSearchResults/QueryExamplesList.tsx
@@ -3,6 +3,7 @@ import React, { useMemo } from 'react';
 import { useSearchQueryExamples } from 'lib/hooks/api/dataModelling/searchQueryExamples';
 import {
   EmptyContentPlaceholder,
+  QueryExamplesListHeader,
   QueryExamplesListItem,
   QueryExamplesSkeleton,
   ScrollableContainer,
@@ -29,22 +30,25 @@ const QueryExamplesList = () => {
   );
 
   return (
-    <ScrollableContainer container id='query-examples-list' $offsetY={165}>
-      <InfiniteScroll
-        dataLength={queryExamples.length}
-        next={fetchNextPage}
-        hasMore={hasNextPage}
-        loader={<QueryExamplesSkeleton />}
-        scrollThreshold='200px'
-        scrollableTarget='query-examples-list'
-      >
-        {queryExamples.map(qe => (
-          <QueryExamplesListItem queryExample={qe} key={qe.definition} />
-        ))}
-        {isLoading && <QueryExamplesSkeleton />}
-        {isEmpty && <EmptyContentPlaceholder offsetTop={215} />}
-      </InfiniteScroll>
-    </ScrollableContainer>
+    <>
+      <QueryExamplesListHeader />
+      <ScrollableContainer container id='query-examples-list' $offsetY={165}>
+        <InfiniteScroll
+          dataLength={queryExamples.length}
+          next={fetchNextPage}
+          hasMore={hasNextPage}
+          loader={<QueryExamplesSkeleton />}
+          scrollThreshold='200px'
+          scrollableTarget='query-examples-list'
+        >
+          {queryExamples.map(qe => (
+            <QueryExamplesListItem queryExample={qe} key={qe.definition} />
+          ))}
+          {isLoading && <QueryExamplesSkeleton />}
+          {isEmpty && <EmptyContentPlaceholder offsetTop={215} />}
+        </InfiniteScroll>
+      </ScrollableContainer>
+    </>
   );
 };
 

diff --git a/odd-platform-ui/src/components/shared/elements/AppToolbar/ToolbarTabs/ToolbarTabs.tsx b/odd-platform-ui/src/components/shared/elements/AppToolbar/ToolbarTabs/ToolbarTabs.tsx
@@ -59,10 +59,6 @@ const ToolbarTabs: FC = () => {
         link: lookupTablesPath(),
         value: 'master-data',
       },
-      {
-        name: t('Master Data'),
-        link: lookupTablesPath(),
-      },
       {
         name: t('Management'),
         link: managementPath(),