-
- {displayName}{' '}
-
#{name}
+
+
+ {displayName}
+ {' '}
+
+ #{name}
+
),
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/external-apps/handle-external-app.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/external-apps/handle-external-app.tsx
index 17d6f0e29..a06014b93 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/external-apps/handle-external-app.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/external-apps/handle-external-app.tsx
@@ -181,7 +181,7 @@ const HandleExternalApp = (props: IDialog) => {
return (
setVisible(v)}>
- {isUpdate ? 'Edit External Name' : 'Add External Name'}
+ {isUpdate ? 'Edit External App' : 'Add External App'}
{(!isUpdate || (isUpdate && props.data)) && }
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx
index ca139debb..7aee47738 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/route.tsx
@@ -11,6 +11,7 @@ import { Button } from '~/components/atoms/button';
import { useState } from 'react';
import { IAccountContext } from '~/console/routes/_main+/$account+/_layout';
import { EmptyManagedResourceImage } from '~/console/components/empty-resource-images';
+import { getSearch } from '~/console/server/utils/common';
import Tools from './tools';
import ManagedResourceResourcesV2 from './managed-resources-resource-v2';
import HandleManagedResourceV2 from './handle-managed-resource-v2';
@@ -22,6 +23,7 @@ export const loader = (ctx: IRemixCtx) => {
ctx.request
).listManagedResources({
search: {
+ ...getSearch(ctx),
envName: {
matchType: 'exact',
exact: environment,
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/tools.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/tools.tsx
index 263c9bd9c..992555b0d 100644
--- a/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/tools.tsx
+++ b/src/apps/console/routes/_main+/$account+/env+/$environment+/managed-resources/tools.tsx
@@ -7,18 +7,18 @@ const Tools = ({ viewMode, setViewMode }: IModeProps) => {
const options = useMemo(
() => [
- {
- name: 'Status',
- type: 'text',
- search: false,
- dataFetcher: async () => {
- return [
- { content: 'Active', value: 'active' },
- { content: 'Freezed', value: 'freezed' },
- { content: 'Archived', value: 'archived' },
- ];
- },
- },
+ // {
+ // name: 'Status',
+ // type: 'text',
+ // search: false,
+ // dataFetcher: async () => {
+ // return [
+ // { content: 'Active', value: 'active' },
+ // { content: 'Freezed', value: 'freezed' },
+ // { content: 'Archived', value: 'archived' },
+ // ];
+ // },
+ // },
],
[searchParams]
);
diff --git a/src/apps/console/routes/_main+/$account+/environments/tools.tsx b/src/apps/console/routes/_main+/$account+/environments/tools.tsx
index 3bfdc3c7c..ecdcb2349 100644
--- a/src/apps/console/routes/_main+/$account+/environments/tools.tsx
+++ b/src/apps/console/routes/_main+/$account+/environments/tools.tsx
@@ -4,6 +4,7 @@ import CommonTools from '~/console/components/common-tools';
const Tools = () => {
const [searchParams] = useSearchParams();
+ console.log('ee params', searchParams);
const options = useMemo(() => [], [searchParams]);
diff --git a/src/apps/console/routes/_main+/$account+/infra+/clusters/tools.tsx b/src/apps/console/routes/_main+/$account+/infra+/clusters/tools.tsx
index ff565f180..f519cdd0f 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/clusters/tools.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/clusters/tools.tsx
@@ -53,23 +53,22 @@ const FilterByCLusterType = ({ onChange, value }: IFilterByClusterType) => {
const Tools = ({ onChange, value }: IFilterByClusterType) => {
const [searchParams] = useSearchParams();
-
+ console.log('cc params', searchParams);
const options = useMemo(
() => [
- {
- name: 'Provider',
- type: 'cloudProviderName',
- search: false,
- dataFetcher: async () => {
- return [
- { content: 'Amazon Web Services', value: 'aws' },
- { content: 'Digital Ocean', value: 'do' },
- { content: 'Google Cloud Platform', value: 'gcp' },
- { content: 'Microsoft Azure', value: 'azure' },
- ];
- },
- },
-
+ // {
+ // name: 'Provider',
+ // type: 'cloudProviderName',
+ // search: false,
+ // dataFetcher: async () => {
+ // return [
+ // { content: 'Amazon Web Services', value: 'aws' },
+ // { content: 'Digital Ocean', value: 'do' },
+ // { content: 'Google Cloud Platform', value: 'gcp' },
+ // { content: 'Microsoft Azure', value: 'azure' },
+ // ];
+ // },
+ // },
// {
// name: 'Region',
// type: 'region',
@@ -81,37 +80,39 @@ const Tools = ({ onChange, value }: IFilterByClusterType) => {
// ];
// },
// },
-
- {
- name: 'Status',
- type: 'isReady',
- search: false,
- dataFetcher: async () => {
- return [
- { content: 'Running', value: true },
- { content: 'Error', value: false },
- // { content: 'Freezed', value: false, type: 'freezed' },
- ];
- },
- },
+ // {
+ // name: 'Status',
+ // type: 'isReady',
+ // search: false,
+ // dataFetcher: async () => {
+ // return [
+ // { content: 'Running', value: true },
+ // { content: 'Error', value: false },
+ // // { content: 'Freezed', value: false, type: 'freezed' },
+ // ];
+ // },
+ // },
],
[searchParams]
);
-
return (
{
- console.log(e);
- onChange?.(e);
- }}
- value={value}
- />
- }
+ // commonToolPrefix={
+ // {
+ // console.log(e);
+ // onChange?.(e);
+ // }}
+ // value={value}
+ // />
+ // }
/>
);
+
+ // const [searchParams] = useSearchParams();
+
+ // const options = useMemo(() => [], [searchParams]);
};
export default Tools;
diff --git a/src/apps/console/routes/_main+/$account+/managed-services/tools.tsx b/src/apps/console/routes/_main+/$account+/managed-services/tools.tsx
index 263c9bd9c..c8ed144e2 100644
--- a/src/apps/console/routes/_main+/$account+/managed-services/tools.tsx
+++ b/src/apps/console/routes/_main+/$account+/managed-services/tools.tsx
@@ -5,23 +5,25 @@ import CommonTools, { IModeProps } from '~/console/components/common-tools';
const Tools = ({ viewMode, setViewMode }: IModeProps) => {
const [searchParams] = useSearchParams();
- const options = useMemo(
- () => [
- {
- name: 'Status',
- type: 'text',
- search: false,
- dataFetcher: async () => {
- return [
- { content: 'Active', value: 'active' },
- { content: 'Freezed', value: 'freezed' },
- { content: 'Archived', value: 'archived' },
- ];
- },
- },
- ],
- [searchParams]
- );
+ const options = useMemo(() => [], [searchParams]);
+
+ // const options = useMemo(
+ // () => [
+ // {
+ // name: 'Status',
+ // type: 'text',
+ // search: false,
+ // dataFetcher: async () => {
+ // return [
+ // { content: 'Active', value: 'active' },
+ // { content: 'Freezed', value: 'freezed' },
+ // { content: 'Archived', value: 'archived' },
+ // ];
+ // },
+ // },
+ // ],
+ // [searchParams]
+ // );
return ;
};
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx
index da6422bfa..ce13413ac 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/route.tsx
@@ -10,6 +10,7 @@ import fake from '~/root/fake-data-generator/fake';
import { Button } from '~/components/atoms/button';
import { IAccountContext } from '~/console/routes/_main+/$account+/_layout';
import { EmptyManagedResourceImage } from '~/console/components/empty-resource-images';
+import { getSearch } from '~/console/server/utils/common';
import Tools from './tools';
import ManagedResourceResourcesV2 from './managed-resources-resource-v2';
@@ -20,13 +21,10 @@ export const loader = (ctx: IRemixCtx) => {
ctx.request
).listManagedResources({
search: {
- managedServiceName: {
- matchType: 'exact',
- exact: msv,
- },
+ ...getSearch(ctx),
+ managedServiceName: { matchType: 'exact', exact: msv },
},
});
-
if (mErrors) {
throw mErrors[0];
}
diff --git a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/tools.tsx b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/tools.tsx
index 263c9bd9c..992555b0d 100644
--- a/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/tools.tsx
+++ b/src/apps/console/routes/_main+/$account+/msvc+/$msv+/managed-resources/tools.tsx
@@ -7,18 +7,18 @@ const Tools = ({ viewMode, setViewMode }: IModeProps) => {
const options = useMemo(
() => [
- {
- name: 'Status',
- type: 'text',
- search: false,
- dataFetcher: async () => {
- return [
- { content: 'Active', value: 'active' },
- { content: 'Freezed', value: 'freezed' },
- { content: 'Archived', value: 'archived' },
- ];
- },
- },
+ // {
+ // name: 'Status',
+ // type: 'text',
+ // search: false,
+ // dataFetcher: async () => {
+ // return [
+ // { content: 'Active', value: 'active' },
+ // { content: 'Freezed', value: 'freezed' },
+ // { content: 'Archived', value: 'archived' },
+ // ];
+ // },
+ // },
],
[searchParams]
);