Revert "fix: Address regression introduced in apache#21284 (apache#21470

)" This reverts commit 8c16806.
mayurnewase · Sep 21, 2022 · 219048f · 219048f
1 parent c6dc8fb
commit 219048f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 9 deletions.
diff --git a/superset-frontend/src/components/TableSelector/index.tsx b/superset-frontend/src/components/TableSelector/index.tsx
@@ -196,7 +196,7 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
         ? data.options.map(table => ({
             value: table.value,
             label: <TableOption table={table} />,
-            text: table.value,
+            text: table.label,
           }))
         : [],
     [data],

diff --git a/superset-frontend/src/hooks/apiResources/tables.test.ts b/superset-frontend/src/hooks/apiResources/tables.test.ts
@@ -103,19 +103,46 @@ describe('useTables hook', () => {
     });
     expect(SupersetClient.get).toHaveBeenCalledTimes(1);
     expect(SupersetClient.get).toHaveBeenCalledWith({
-      endpoint: `/superset/tables/${expectDbId}/${expectedSchema}/${forceRefresh}/`,
+      endpoint: `/superset/tables/${expectDbId}/${expectedSchema}/undefined/${forceRefresh}/`,
     });
     expect(result.current.data).toEqual(expectedData);
     await act(async () => {
       result.current.refetch();
     });
     expect(SupersetClient.get).toHaveBeenCalledTimes(2);
     expect(SupersetClient.get).toHaveBeenCalledWith({
-      endpoint: `/superset/tables/${expectDbId}/${expectedSchema}/true/`,
+      endpoint: `/superset/tables/${expectDbId}/${expectedSchema}/undefined/true/`,
     });
     expect(result.current.data).toEqual(expectedData);
   });
 
+  it('returns api response for search keyword', async () => {
+    const expectDbId = 'db1';
+    const expectedSchema = 'schemaA';
+    const expectedKeyword = 'my work';
+    const forceRefresh = false;
+    renderHook(
+      () =>
+        useTables({
+          dbId: expectDbId,
+          schema: expectedSchema,
+          keyword: expectedKeyword,
+        }),
+      {
+        wrapper: QueryProvider,
+      },
+    );
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    expect(SupersetClient.get).toHaveBeenCalledTimes(1);
+    expect(SupersetClient.get).toHaveBeenCalledWith({
+      endpoint: `/superset/tables/${expectDbId}/${expectedSchema}/${encodeURIComponent(
+        expectedKeyword,
+      )}/${forceRefresh}/`,
+    });
+  });
+
   it('returns hasMore when total is larger than result size', async () => {
     (SupersetClient.get as jest.Mock).mockResolvedValueOnce(
       fakeHasMoreApiResult,

diff --git a/superset-frontend/src/hooks/apiResources/tables.ts b/superset-frontend/src/hooks/apiResources/tables.ts
@@ -24,6 +24,7 @@ export type FetchTablesQueryParams = {
   dbId?: string | number;
   schema?: string;
   forceRefresh?: boolean;
+  keyword?: string;
 };
 export interface Table {
   label: string;
@@ -51,24 +52,26 @@ export function fetchTables({
   dbId,
   schema,
   forceRefresh,
+  keyword,
 }: FetchTablesQueryParams) {
   const encodedSchema = schema ? encodeURIComponent(schema) : '';
+  const encodedKeyword = keyword ? encodeURIComponent(keyword) : 'undefined';
   // TODO: Would be nice to add pagination in a follow-up. Needs endpoint changes.
   const endpoint = `/superset/tables/${
     dbId ?? 'undefined'
-  }/${encodedSchema}/${forceRefresh}/`;
+  }/${encodedSchema}/${encodedKeyword}/${forceRefresh}/`;
   return SupersetClient.get({ endpoint }) as Promise<QueryData>;
 }
 
 type Params = FetchTablesQueryParams &
   Pick<UseQueryOptions, 'onSuccess' | 'onError'>;
 
 export function useTables(options: Params) {
-  const { dbId, schema, onSuccess, onError } = options || {};
+  const { dbId, schema, keyword, onSuccess, onError } = options || {};
   const forceRefreshRef = useRef(false);
-  const params = { dbId, schema };
+  const params = { dbId, schema, keyword };
   const result = useQuery<QueryData, Error, Data>(
-    ['tables', { dbId, schema }],
+    ['tables', { dbId, schema, keyword }],
     () => fetchTables({ ...params, forceRefresh: forceRefreshRef.current }),
     {
       select: ({ json }) => ({

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -172,7 +172,7 @@ export default function LeftPanel({
   useEffect(() => {
     if (loadTables) {
       const endpoint = encodeURI(
-        `/superset/tables/${dbId}/${encodedSchema}/${refresh}/`,
+        `/superset/tables/${dbId}/${encodedSchema}/undefined/${refresh}/`,
       );
       getTablesList(endpoint);
     }
@@ -188,8 +188,10 @@ export default function LeftPanel({
   const search = useMemo(
     () =>
       debounce((value: string) => {
+        const encodeTableName =
+          value === '' ? undefined : encodeURIComponent(value);
         const endpoint = encodeURI(
-          `/superset/tables/${dbId}/${encodedSchema}/`,
+          `/superset/tables/${dbId}/${encodedSchema}/${encodeTableName}/`,
         );
         getTablesList(endpoint);
       }, FAST_DEBOUNCE),