fix: deduplicate in select provider models and target models

src/pages/maas-provider/forms/model-item.tsx

@@ -9,7 +9,7 @@ import {
 } from '@ant-design/icons';
 import { useIntl } from '@umijs/max';
 import { Button, Form, Tooltip } from 'antd';
-import React from 'react';
+import React, { useMemo } from 'react';
 import styled from 'styled-components';
 import { useFormContext } from '../config/form-context';
 import { FormData, ProviderModel } from '../config/types';
@@ -128,25 +128,36 @@ const ModelItem: React.FC<ModelItemProps> = ({
   };
 
   // filter out already selected models, but keep the current one
-  const selectedModelMap = new Map(
+  const selectedModelSet = useMemo(() => {
-    selectedModelList?.map((model) => [model.name, true])
+    return new Set(selectedModelList?.map((model) => model.name));
-  );
+  }, [selectedModelList]);
-  const filteredOptions = () => {
+
+  const filteredOptions = useMemo(() => {
     return providerModelList.filter((model) => {
-      return model.value === item.name || !selectedModelMap.has(model.value);
+      return model.value === item.name || !selectedModelSet.has(model.value);
     });
-  };
+  }, [providerModelList, item.name, selectedModelSet]);
 
   return (
     <SelectWrapper>
       <AutoComplete
         loading={loading}
-        showSearch
+        showSearch={{
+          filterOption: (inputValue, option: any) => {
+            return (
+              option!.value.toLowerCase().includes(inputValue.toLowerCase()) ||
+              option.label
+                ?.toString()
+                .toLowerCase()
+                .includes(inputValue.toLowerCase())
+            );
+          }
+        }}
         onOpenChange={onOpenChange}
         suffixIcon={renderSuffixIcon()}
         value={item.name}
         onChange={handleOnChange}
-        options={filteredOptions()}
+        options={filteredOptions}
         placeholder={intl.formatMessage({ id: 'providers.table.models' })}
       />
       <SealSelect

src/pages/maas-provider/forms/supported-models.tsx

@@ -31,9 +31,10 @@ const SupportedModels = () => {
 
   const handleOpenChange = async (open: boolean) => {
     try {
-      await form.validateFields(['api_key']);
+      await form.validateFields(['api_key', ['config', 'type']]);
 
       const currentAPIKey = form.getFieldValue('api_key') || '';
+      console.log('handleOpenChange', { open, currentAPIKey });
 
       // Avoid repeated requests with the same API key
       if (
@@ -54,7 +55,9 @@ const SupportedModels = () => {
           }
         });
       }
-    } catch (error) {}
+    } catch (error) {
+      prevAPIKeyRef.current = '';
+    }
   };
 
   const updateModelList = (models: ProviderModel[]) => {

src/pages/model-routes/components/route-targets.tsx

@@ -88,7 +88,7 @@ const RouteItem: React.FC<TargetItemProps> = ({
           <Col span={5} style={{ paddingLeft: 56 }}>
             <CellContent>{renderProviderSource()}</CellContent>
           </Col>
-          <Col span={3}>
+          <Col span={2}>
             <CellContent>
               {data.weight > 0 && (
                 <AutoTooltip ghost>
@@ -112,7 +112,7 @@ const RouteItem: React.FC<TargetItemProps> = ({
                 )}
             </CellContent>
           </Col>
-          <Col span={2}>
+          <Col span={3}>
             <CellContent>
               <AutoTooltip ghost>
                 <StatusTag

src/pages/model-routes/forms/targets.tsx

@@ -134,16 +134,18 @@ const TargetsForm = forwardRef((props, ref) => {
 
     const selectedDataList = [...dataList, { value: fallbackValues.value }];
 
-    const selectedKeys = selectedDataList
+    const selectedKeys = new Set(
-      .filter((item) => item.value)
+      selectedDataList
-      .map((item) => buildKey(item.value));
+        .filter((item) => item.value)
+        .map((item) => buildKey(item.value))
+    );
 
     return sourceModels
       .map((model) => {
         const children = model.children?.filter((child) => {
           const key = buildKey([child.data?.parentId, child.value]);
 
-          return !selectedKeys.includes(key) || key === currKey;
+          return !selectedKeys.has(key) || key === currKey;
         });
 
         return {

src/pages/model-routes/hooks/use-target-source-models.tsx

@@ -5,6 +5,7 @@ import { queryMaasProviders } from '@/pages/maas-provider/apis';
 import ProviderLogo from '@/pages/maas-provider/components/provider-logo';
 import { MaasProviderItem } from '@/pages/maas-provider/config/types';
 import { useIntl } from '@umijs/max';
+import _ from 'lodash';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 
@@ -52,30 +53,27 @@ const useTargetSourceModels = () => {
           value: 'deployments',
           providerType: 'deployments',
           parent: true,
-          children: models.items?.map?.((model: ModelListItem) => ({
+          children: _.uniqBy(
-            label: model.name,
+            models.items?.map?.((model: ModelListItem) => [
-            value: model.id,
+              model.id,
-            data: {
+              {
-              model_id: model.id,
+                label: model.name,
-              parentId: 'deployments'
+                value: model.id,
-            },
+                data: {
-            source: 'deployment'
+                  model_id: model.id,
-          }))
+                  parentId: 'deployments'
+                },
+                source: 'deployment'
+              }
+            ]),
+            'value'
+          )
         }
       ].filter((group) => group.children && group.children.length > 0);
 
       const providerOptions: CascaderOption[] = providers.items
-        ?.map?.((provider: MaasProviderItem) => ({
+        ?.map?.((provider: MaasProviderItem) => {
-          label: (
+          const children = provider.models?.map?.((model) => ({
-            <OptionWrapper>
-              <ProviderLogo provider={provider.config?.type as string} />
-              <span>{provider.name}</span>
-            </OptionWrapper>
-          ),
-          value: provider.id,
-          parent: true,
-          providerType: provider.config?.type,
-          children: provider.models?.map?.((model) => ({
             label: model.name,
             value: model.name,
             data: {
@@ -84,8 +82,21 @@ const useTargetSourceModels = () => {
               parentId: provider.id
             },
             source: 'providerModel'
-          }))
+          }));
-        }))
+
+          return {
+            label: (
+              <OptionWrapper>
+                <ProviderLogo provider={provider.config?.type as string} />
+                <span>{provider.name}</span>
+              </OptionWrapper>
+            ),
+            value: provider.id,
+            parent: true,
+            providerType: provider.config?.type,
+            children: _.uniqBy(children, 'value')
+          };
+        })
         .filter((group) => group.children && group.children.length > 0);
 
       setSourceModels([...modelsList, ...providerOptions]);

src/pages/model-routes/index.tsx

@@ -65,8 +65,13 @@ const ModelRoutes: React.FC = () => {
   const { watchDataList: allRouteTargets, deleteItemFromCache } =
     useWatchList(MODEL_ROUTE_TARGETS);
   const [expandAtom] = useAtom(expandKeysAtom);
-  const { handleExpandChange, handleExpandAll, expandedRowKeys } =
+  const {
-    useExpandedRowKeys(expandAtom);
+    handleExpandChange,
+    handleExpandAll,
+    updateExpandedRowKeys,
+    removeExpandedRowKey,
+    expandedRowKeys
+  } = useExpandedRowKeys(expandAtom);
   const intl = useIntl();
   const { openRouteModalStatus, openRouteModal, closeRouteModal } =
     useCreateRoute();
@@ -109,17 +114,22 @@ const ModelRoutes: React.FC = () => {
       ...data
     };
     try {
+      let data: ListItem = {} as any;
       if (openRouteModalStatus.action === PageAction.EDIT) {
-        await updateModelRoute({
+        data = await updateModelRoute({
           data: params,
           id: openRouteModalStatus.currentData!.id
         });
       }
       if (openRouteModalStatus.action === PageAction.CREATE) {
-        await createModelRoute({
+        data = await createModelRoute({
           data: params
         });
       }
+
+      if (data.targets > 0) {
+        updateExpandedRowKeys([data.id, ...expandedRowKeys]);
+      }
       fetchData();
       closeRouteModal();
       message.success(intl.formatMessage({ id: 'common.message.success' }));