Skip to content

Commit

Permalink
feat: console 4.0
Browse files Browse the repository at this point in the history
Signed-off-by: ci-bot <[email protected]>
Signed-off-by: joyceliu <[email protected]>
  • Loading branch information
ks-ci-bot authored and joyceliu committed Aug 30, 2024
1 parent 20b2784 commit bb86c8d
Show file tree
Hide file tree
Showing 7,689 changed files with 480,478 additions and 385,919 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
15 changes: 15 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [["@ks-console/*"]],
"linked": [],
"access": "public",
"baseBranch": "ksc-release-4.1",
"updateInternalDependencies": "patch",
"ignore": [],
"snapshot": {
"useCalculatedVersion": true,
"prereleaseTemplate": "{tag}.{datetime}"
}
}
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules

.idea
14 changes: 7 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
root = true

[*.jsx?]
charset = utf-8
[*]
indent_style = space
indent_size = 2
tab_width = 2
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[Makefile]
indent_style = tab

[*.yaml]
indent_style = space
indent_size = 2
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ node_modules/
jest.config.js
babel.config.js
.eslintrc.js
locales/
locales/
packages/*/lib/
111 changes: 7 additions & 104 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,116 +1,19 @@
/*
* This file is part of KubeSphere Console.
* Copyright (C) 2019 The KubeSphere Console Authors.
*
* KubeSphere Console is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* KubeSphere Console is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with KubeSphere Console. If not, see <https://www.gnu.org/licenses/>.
*/

// http://eslint.org/docs/user-guide/configuring
const path = require('path');

const resolve = dir => path.resolve(__dirname, dir);

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module',
ecmaFeatures: {
jsx: true,
modules: true,
},
project: ['./tsconfig.json'],
},
env: {
es6: true,
commonjs: true,
browser: true,
jest: true,
},
extends: ['airbnb-base', 'plugin:prettier/recommended'],
// https://github.com/yannickcr/eslint-plugin-react
plugins: ['react', 'babel', 'promise'],
// check if imports actually resolve
extends: ['kubesphere'],
settings: {
'import/resolver': {
webpack: {
config: 'scripts/webpack.base.js',
config: resolve('packages/bootstrap/webpack/webpack.base.conf.js'),
},
},
},
// add your custom rules here
rules: {
// allow paren-less arrow functions
'arrow-parens': 0,
'import/no-extraneous-dependencies': 0,
'import/no-dynamic-require': 0,
'import/no-cycle': 0,
// allow async-await
'generator-star-spacing': 0,
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
'global-require': 0,
'no-console': ["error", { allow: ["warn", "error"] }],
'dot-notation': 0,
'no-underscore-dangle': 0,
'no-param-reassign': 0,
'no-unused-expressions': 0,
'no-mixed-operators': 0,
'no-return-await': 0,
'no-restricted-syntax': 0,
'no-await-in-loop': 0,
'no-restricted-globals': 0,
'no-empty': [
2,
{
allowEmptyCatch: true,
},
],
camelcase: 0,
'max-len': [
1,
{
code: 100,
tabWidth: 2,
ignoreUrls: true,
ignoreComments: true,
ignoreRegExpLiterals: true,
ignoreTrailingComments: true,
ignoreStrings: true,
ignoreTemplateLiterals: true,
ignorePattern:
"^(\\s*[a-zA-Z_]+: '[^']+'[,;]*)|(.*require.*)$",
},
],
'import/prefer-default-export': 0,
'no-eval': 0,
'no-plusplus': 0,
'func-names': 0,
'consistent-return': 0,
'react/jsx-uses-react': 2,
'react/jsx-uses-vars': 2,
'class-methods-use-this': 0,
'no-nested-ternary': 0,
'no-use-before-define': 0,
'prefer-destructuring': 0,
'max-classes-per-file': 0,
'prefer-promise-reject-errors': 0,
},
parserOptions: {
ecmaFeatures: {
legacyDecorators: true
}
},
globals: {
t: true,
globals: true,
request: true,
},
}
};
4 changes: 2 additions & 2 deletions .github/workflows/deploy-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
needs: deploy-check
strategy:
matrix:
node-version: [12.18.x]
node-version: [16.x]
steps:
- name: get pull request ref
id: get_pull_request_ref
Expand All @@ -44,7 +44,7 @@ jobs:
repository: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.repo.full_name }}
ref: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.ref }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue_comment_webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: "20.x"
node-version: "16.x"
- run: npm install axios
- name: Send issue/comment to WeCom webhook
uses: actions/github-script@v7
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:

strategy:
matrix:
node-version: [ '14.x' ]
node-version: [ '16.x' ]

steps:
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down Expand Up @@ -59,4 +59,4 @@ jobs:
# with:
# status: ${{ job.status }}
# fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
# if: failure()
# if: failure()
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
/node_modules
node_modules

# testing
/coverage

# production
/dist
dist
cjs
esm
packages/*/lib

# misc
.DS_Store

logs/
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.idea/

# local config
/server/local_config.yaml
/configs/local_config.yaml

*.rdb
.cache-loader

# typescript
*.tsbuildinfo
.npmrc
.history
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run pre-commit
4 changes: 4 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.vscode
build
hack
dist
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16
15 changes: 13 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
node_modules
.git/
.history/
**/node_modules/
**/dist/
**/v3dist/
**/*.tsbuildinfo
packages/*/lib/
packages/*/esm/
packages/*/cjs/
yarn.lock
package-lock.json
package-lock.json

# system.min.js
**/*.min.js
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM amd64/node:14-alpine3.14
RUN adduser -D -g kubesphere -u 1002 kubesphere && \
mkdir -p /opt/kubesphere/console && \
chown -R kubesphere:kubesphere /opt/kubesphere/console
WORKDIR /opt/kubesphere/console
COPY . /opt/kubesphere/console
RUN mv dist/server.js server/server.js
USER kubesphere
EXPOSE 8000
CMD ["npm", "run", "serve"]
22 changes: 9 additions & 13 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
approvers:
- zheng1
- harrisonliu5
- patrickluoyu
- zheng1
- donniean

reviewers:
- zheng1
- leoendless
- justahole
- LinuxSuRen
- liuboaibc
- xuliwenwenwen
- harrisonliu5
- qinyueshang
- fuchunlan
- patrickluoyu
- zheng1
- donniean
- miaqiang
- 51wangping
- fuchunlan
- yazhouio
- Leioy
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ KubeSphere console is the web interface for [KubeSphere](https://github.com/kube

## Getting Started

Console should be always used with KubeSphere, you can either use [Kubekey](https://github.com/kubesphere/kubekey) or [ks-installer](https://github.com/kubesphere/ks-installer) to create a KubeSphere cluster.
Console should be always used with KubeSphere, you can either use [Kubekey](https://github.com/kubesphere/kubekey) or [ks-installer](https://github.com/kubesphere/ks-installer) to create a KubeSphere cluster.
The following will show you how to build console from source code.


Expand Down Expand Up @@ -87,7 +87,7 @@ Follow [Development Workflow](/docs/development-workflow.md) to commit your code

## Support, Discussion, and Community

If you need any help with KubeSphere, please join us at [Slack Channel](https://join.slack.com/t/kubesphere/shared_invite/zt-1ilxbsp39-t4ES4xn5OI0eF5hvOoAhEw).
If you need any help with KubeSphere, please join us at [Slack Channel](https://join.slack.com/t/kubesphere/shared_invite/enQtNTE3MDIxNzUxNzQ0LTZkNTdkYWNiYTVkMTM5ZThhODY1MjAyZmVlYWEwZmQ3ODQ1NmM1MGVkNWEzZTRhNzk0MzM5MmY4NDc3ZWVhMjE).

Please submit any KubeSphere Console bugs, issues, and feature requests to [KubeSphere Console GitHub Issue](https://github.com/kubesphere/console/issues).

Expand Down
13 changes: 13 additions & 0 deletions app-TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 应用商定问题:

1、应用列表未返回最新版本信息。导致前端都是查询了一次版本列表信息

2、页面新增了很多TODO 待处理问题

3、应用部署详情界面报错。暂未处理。


4、 边缘集群 节点组接口全换


5、内嵌v4调用v3时候 第一次请求都失败
Loading

0 comments on commit bb86c8d

Please sign in to comment.