Merge branch 'master' into 0.7.x

apache · Jul 11, 2024 · 729cfd1 · 729cfd1
2 parents cdc2602 + f1fbfa1
commit 729cfd1
Show file tree

Hide file tree

Showing 6 changed files with 173 additions and 257 deletions.
diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js b/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
@@ -65,14 +65,14 @@ export default [
     url: '/mock/ams/v1/catalogs/test_catalog/databases',
     method: 'get',
     response: () => {
-      return { "message": "success", "code": 200, "result": ["db"] }
+      return { "message": "success", "code": 200, "result": ["db", "test", "acc"] }
     },
   },
   {
     url: '/mock/ams/v1/catalogs/test_catalog/databases/db/tables',
     method: 'get',
     response: () => {
-      return { "message": "success", "code": 200, "result": [{ "name": "user", "type": "ICEBERG" }] };
+      return { "message": "success", "code": 200, "result": [{ "name": "user", "type": "ICEBERG" },{ "name": "wf", "type": "ICEBERG" }, { "name": "xcvz", "type": "ICEBERG" }] };
     },
   },
   {
@@ -131,7 +131,7 @@ export default [
     response: () => ({ "message": "success", "code": 200, "result": true }),
   },
   {
-    url: '/mock/ams/v1/catalog/metastore/types',
+    url: '/mock/ams/v1/catalogs/metastore/types',
     method: 'get',
     response: () => ({
       "message": "success",

diff --git a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue
@@ -105,13 +105,13 @@ export default defineComponent({
     function getSearchTableList() {
       debounce(() => {
         getAllTableList()
-      })
+      })()
     }
 
     function getSearchDBList() {
       debounce(() => {
         getAllDatabaseList(true)
-      })
+      })()
     }
 
     function handleClickDb(item: IDatabaseItem) {
@@ -308,7 +308,7 @@ export default defineComponent({
               v-model:value="DBSearchInput"
               :placeholder="placeholder.filterDBPh"
               class="theme-dark"
-              @change="() => handleSearch('db')"
+              @change="handleSearch('db')"
             >
               <template #prefix>
                 <SearchOutlined />
@@ -333,7 +333,7 @@ export default defineComponent({
               v-model:value="tableSearchInput"
               :placeholder="placeholder.filterTablePh"
               class="theme-dark"
-              @change="() => handleSearch('table')"
+              @change="handleSearch('table')"
             >
               <template #prefix>
                 <SearchOutlined />

diff --git a/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts b/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts
@@ -20,7 +20,7 @@ import type { IMap } from '@/types/common.type'
 import request from '@/utils/request'
 
 export function getCatalogsTypes() {
-  return request.get('ams/v1/catalog/metastore/types')
+  return request.get('ams/v1/catalogs/metastore/types')
 }
 export function getCatalogsSetting(catalogName: string) {
   return request.get(`ams/v1/catalogs/${catalogName}`)