refactor: project logic web

* feat: fix monitor ns prefix

* feat: add project resourceLimit manage

* feat: add sub project

* feat: add project ns migrate

* feat: add project ns kubectlConfig

* feat: add bussiness project model

* feat: refator project

* feat(bussiness): add projectId requestHeader

* fix: nodeSelector can not select more node

* feat: add Import cluster

* feat: add helm namespace

* feat: add project ns kubeconfig

Co-authored-by: kaychen <[email protected]>

web/console/.babelrc

@@ -4,21 +4,30 @@
  "env": {
  "development": {
  "presets": [
- ["env", {
- "loose": true,
- "modules": "commonjs",
- "exclude": ["babel-plugin-transform-async-to-generator", "babel-plugin-transform-regenerator", "babel-plugin-transform-es2015-spread"]
- }]
+ [
+ "env",
+ {
+ "loose": true,
+ "modules": "commonjs",
+ "exclude": [
+ "babel-plugin-transform-async-to-generator",
+ "babel-plugin-transform-regenerator",
+ "babel-plugin-transform-es2015-spread"
+ ]
+ }
+ ]
  ],
  "plugins": [
  [
  "react-transform",
  {
- "transforms": [{
- "transform": "react-transform-hmr",
- "imports": ["react"],
- "locals": ["module"]
- }]
+ "transforms": [
+ {
+ "transform": "react-transform-hmr",
+ "imports": ["react"],
+ "locals": ["module"]
+ }
+ ]
  }
  ]
  ]

web/console/.eslintrc

@@ -1,6 +1,7 @@
 {
  "extends": ["eslint-config-alloy/react", "eslint-config-alloy/typescript"],
  "rules": {
+ "@typescript-eslint/no-namespace": ["off"],
  "indent": ["off"],
  "no-script-url": ["off"],
  "no-implicit-coercion": ["off"],
@@ -34,15 +35,17 @@
  "react/jsx-curly-brace-presence": ["off"],
  "react/sort-comp": ["off"]
  },
- "overrides": [{
- "files": ["**/*.ts", "**/*.tsx"],
- "rules": {
- "no-unused-vars": ["off"]
+ "overrides": [
+ {
+ "files": ["**/*.ts", "**/*.tsx"],
+ "rules": {
+ "no-unused-vars": ["off"]
+ }
  }
- }],
+ ],
  "settings": {
  "react": {
  "version": "detect"
  }
  }
-}
+}

web/console/Wrapper.tsx

@@ -187,6 +187,11 @@ const businessCommonRouterConfig: RouterConfig[] = [
  title: 'Helm应用',
  watchModule: ConsoleModuleEnum.PLATFORM
  },
+ {
+ url: '/tkestack-project/project',
+ title: '业务管理',
+ watchModule: ConsoleModuleEnum.Business
+ },
  {
  title: '组织资源',
  watchModule: [ConsoleModuleEnum.Registry, ConsoleModuleEnum.Auth],

web/console/blankPage.tsx

@@ -3,18 +3,11 @@ import { Button } from '@tea/component/button';
 import { Blank, BlankTheme } from '@tea/component/blank';
 import { Card } from '@tea/component/card';
 import { Layout } from '@tea/component/layout';
-import { ExternalLink } from '@tea/component/link';
-import { Radio } from '@tea/component/radio';
 import { ContentView } from '@tencent/tea-component';
 
 const { Body, Content } = Layout;
 
 function BlankExample() {
- /**
- * @type [any, any]
- */
- const [theme, setTheme] = useState('permission');
-
  return (
  <ContentView>
  <ContentView.Body>

web/console/config/resource/common/apiVersion.ts

@@ -49,6 +49,7 @@ export interface ApiVersion {
  helm?: ResourceApiInfo;
  logcs?: ResourceApiInfo;
  clustercredential?: ResourceApiInfo;
+ auth_project?: ResourceApiInfo;
 
  lbcf?: ResourceApiInfo;
  lbcf_bg?: ResourceApiInfo;
@@ -389,6 +390,13 @@ const k8sApiVersionFor18: ApiVersion = {
  watchModule: ConsoleModuleEnum.Auth,
  headTitle: 'Users'
  },
+ auth_project: {
+ group: authServerVersion.group,
+ version: authServerVersion.version,
+ basicEntry: authServerVersion.basicUrl,
+ watchModule: ConsoleModuleEnum.Auth,
+ headTitle: 'PorjectUsers'
+ },
  role: {
  group: authServerVersion.group,
  version: authServerVersion.version,

web/console/config/resource/k8sConfig/otherResource.ts

@@ -209,6 +209,17 @@ export const user = (k8sVersion: string) => {
  });
 };
 
+/** users的配置 */
+export const auth_project = (k8sVersion: string) => {
+ return generateResourceInfo({
+ k8sVersion,
+ resourceName: 'auth_project',
+ requestType: {
+ list: 'projects'
+ }
+ });
+};
+
 /** roles的配置 */
 export const role = (k8sVersion: string) => {
  return generateResourceInfo({

web/console/config/resourceConfig.ts

@@ -1,3 +1,4 @@
+import { auth_project } from './resource/k8sConfig/otherResource';
 import {
  deployment,
  statefulset,
@@ -181,6 +182,7 @@ export const resourceConfig = (k8sVersion: string = '1.16'): ResourceConfigKey =
  role: getResourceConfig(role, finalK8sVersion),
  localgroup: getResourceConfig(localgroup, finalK8sVersion),
  group: getResourceConfig(group, finalK8sVersion),
+ auth_project: getResourceConfig(auth_project, finalK8sVersion),
  /** =============== 这里是权限相关的 =============== */
 
  /** 告警配置 */

web/console/helpers/appUtil.ts

@@ -53,6 +53,18 @@ export function getClusterId(): string {
  return rId;
 }
 
+/**
+ * 设置默认集群
+ */
+export function setProjectName(projectId: string) {
+ util.cookie.set('projectId', projectId);
+}
+
+export function getProjectName(): string {
+ let rId = util.cookie.get('projectId');
+ return rId;
+}
+
 /**
  * 设置默认集群
  */
@@ -62,7 +74,6 @@ export function setClusterId(clusterId: string) {
  localStorage[util.getUin() + '_clusterId'] = clusterId;
  }
 }
-
 /**
  * 获取当前默认的集群命名空间
  */
@@ -145,7 +156,7 @@ export function setRegionList(list: string[]) {
 
 export function debounce(fn, delay: number, immediate?: boolean) {
  let timer = null;
- return function() {
+ return function () {
  const that = this;
  const args = arguments; // 箭头函数不能用arguments参数
  if (timer) {
@@ -158,12 +169,12 @@ export function debounce(fn, delay: number, immediate?: boolean) {
  }
 
  // 过了delay时间，设置判定条件timer = null; 上边才可以响应
- timer = setTimeout(function() {
+ timer = setTimeout(function () {
  timer = null;
  }, delay);
  } else {
  // 每次触发都要delay时间之后才响应
- timer = setTimeout(function() {
+ timer = setTimeout(function () {
  fn.apply(that, args);
  }, delay);
  }

web/console/helpers/downloadText.ts

@@ -0,0 +1,35 @@
+const tips = seajs.require('tips');
+import { t, Trans } from '@tencent/tea-app/lib/i18n';
+
+export function downloadText(crtText, filename, contentType = 'text/plain;charset=utf-8;') {
+ let crtFile = '\ufeff';
+ let userAgent = navigator.userAgent;
+
+ if (navigator.msSaveBlob) {
+ let blob = new Blob([crtText], { type: contentType });
+ navigator.msSaveBlob(blob, filename);
+ } else if (userAgent.indexOf('MSIE 9.0') > 0) {
+ tips.error(t('该浏览器暂不支持导出功能'));
+ } else {
+ let blob = new Blob([crtText], { type: contentType });
+ let link = document.createElement('a') as any;
+
+ if (link.download !== undefined) {
+ let url = URL.createObjectURL(blob);
+ link.setAttribute('href', url);
+ link.setAttribute('download', filename);
+ link.style.visibility = 'hidden';
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ }
+ }
+}
+
+export function downloadCrt(crtText, filename = 'cluster-ca.crt') {
+ downloadText(crtText, filename, 'text/plain;charset=utf-8;');
+}
+
+export function downloadKubeconfig(crtText, filename = 'kubeconfig') {
+ downloadText(crtText, filename, 'applicatoin/octet-stream;charset=utf-8;');
+}

web/console/helpers/index.ts

@@ -18,4 +18,4 @@ export { getScrollBarSize } from './getScrollBarSize';
 export { dateFormat } from './dateUtil';
 export * from './appUtil';
 export { getCookie } from './cookieUtil';
-export { reduceK8sQueryString, reduceK8sRestfulPath, reduceNs } from './urlUtil';
+export { reduceK8sQueryString, reduceK8sRestfulPath, reduceNs, parseQueryString } from './urlUtil';

web/console/helpers/reduceNetwork.ts

@@ -2,6 +2,8 @@ import axios from 'axios';
 import { OperationResult } from '@tencent/ff-redux';
 import { RequestParams, ResourceInfo } from '../src/modules/common/models';
 import { changeForbiddentConfig } from '../index';
+import { parseQueryString } from './urlUtil';
+import { getProjectName } from './appUtil';
 
 /** 是否展示没有权限的弹窗 */
 export let Init_Forbiddent_Config = {
@@ -71,16 +73,8 @@ export const requestMethodForAction = (type: string) => {
  * 统一的请求处理
  * @param userParams: RequestParams
  */
-export const reduceNetworkRequest = async (userParams: RequestParams, clusterId?: string, projectId?: string, keyword?: string) => {
- let {
- method,
- url,
- userDefinedHeader = {},
- data = {},
- apiParams,
- // baseURL = getConsoleAPIAddress(ConsoleModuleAddressEnum.PLATFORM)
- baseURL = GET_CONSOLE_MODULE_BASE_URL
- } = userParams;
+export const reduceNetworkRequest = async (userParams: RequestParams, clusterId?: string, keyword?: string) => {
+ let { method, url, userDefinedHeader = {}, data = {}, apiParams, baseURL = GET_CONSOLE_MODULE_BASE_URL } = userParams;
 
  let rsp;
  // 请求tke-apiserver的 cluster的header
@@ -89,16 +83,26 @@ export const reduceNetworkRequest = async (userParams: RequestParams, clusterId?
  'X-TKE-ClusterName': clusterId
  });
  }
- if (projectId) {
- userDefinedHeader = Object.assign({}, userDefinedHeader, {
- 'X-TKE-ProjectName': projectId
- });
- }
- if (keyword) {
- userDefinedHeader = Object.assign({}, userDefinedHeader, {
- 'X-TKE-FuzzyResourceName': keyword
- });
+
+ /// #if project
+ let searchParams;
+ try {
+ searchParams = parseQueryString(location.search);
+ } catch (error) {}
+ let projectId = '';
+ if (searchParams && (searchParams.projectName || searchParams.projectId)) {
+ projectId = searchParams.projectName || searchParams.projectId;
+ } else {
+ projectId = getProjectName();
  }
+ userDefinedHeader = Object.assign(
+ {},
+ {
+ 'X-TKE-ProjectName': projectId
+ },
+ userDefinedHeader
+ );
+ /// #endif
 
  let params = {
  method,
@@ -125,7 +129,7 @@ export const reduceNetworkRequest = async (userParams: RequestParams, clusterId?
  } catch (error) {
  // 如果返回是 401的话，自动登出，此时是鉴权不过，cookies失效了
  if (error.response && error.response.status === 401) {
- // location.reload();
+ location.reload();
  } else if (error.response && error.response.status === 403) {
  changeForbiddentConfig({
  isShow: true,
@@ -182,7 +186,7 @@ export const reduceNetworkWorkflow = (error: any) => {
  * @param target T[]
  * @param error any
  */
-export const operationResult = function<T>(target: T[] | T, error?: any): OperationResult<T>[] {
+export const operationResult = function <T>(target: T[] | T, error?: any): OperationResult<T>[] {
  if (target instanceof Array) {
  return target.map(x => ({ success: !error, target: x, error }));
  }

web/console/helpers/urlUtil.ts

@@ -125,7 +125,6 @@ export const reduceK8sRestfulPath = (options: K8sRestfulPathOptions) => {
  resourceInfo,
  namespace = '',
  isSpetialNamespace = false,
- middleKey = '',
  specificName = '',
  extraResource = '',
  clusterId = '',

web/console/index.project.tsx

@@ -19,6 +19,7 @@ import { AlarmPolicy } from '@src/modules/alarmPolicy';
 import { Notify } from '@src/modules/notify';
 // 公有云的图表组件为异步加载，这里为了减少路径配置，还是保留为同步加载，预先import即可变成不split
 import '@tencent/tchart/build/ChartsComponents';
+import { Project } from '@src/modules/project';
 insertCSS(
  'myTagSearchBox',
  `.myTagSearchBox{ width:100% !important; background-color: #fff; }
@@ -113,6 +114,19 @@ Entry.register({
  )
  },
 
+ /**
+ * @url https://{{domain}}/tkestack-project/project
+ */
+ project: {
+ title: t('业务管理 - TKEStack业务侧'),
+ container: (
+ <Wrapper platformType={PlatformTypeEnum.Business}>
+ <ForbiddentDialog />
+ <Project />
+ </Wrapper>
+ )
+ },
+
  /**
  * @urlhttps://{{domain}}//tkestack-project/regitry
  */

web/console/lib/ff-component/src/formpanel/TransferTable.tsx

@@ -121,8 +121,8 @@ function FormPanelTransferTable<TResource = any>({ ...props }: FormPanelTransfer
  <Transfer.Cell
  title={
  title +
- t('  共{{totalCount}}项 已加载 {{count}} 项', {
- totalCount: finallist.data.recordCount,
+ t(' 已加载 {{count}} 项', {
+ // totalCount: finallist.data.recordCount,
  count: finallist.data.records.length
  })
  }
@@ -143,9 +143,7 @@ function FormPanelTransferTable<TResource = any>({ ...props }: FormPanelTransfer
  bottomTip={
  isNeedScollLoding && finallist.data.records.length < finallist.data.recordCount ? (
  <LoadingTip />
- ) : (
- undefined
- )
+ ) : undefined
  }
  scrollable={scrollableOption}
  selectable={{