Skip to content

feat(web): port system administration and shell updates #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hardy-dev-infinilabs wants to merge 1 commit into from
Closed

feat(web): port system administration and shell updates #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 65 additions & 198 deletions web/config/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,69 @@ import webpackPlugin from "./plugin.config";
import defaultSettings from "../src/defaultSettings";
import packageJson from "../package.json";

const ProxyTarget = "http://localhost:9001"
const ProxyTarget = "https://localhost:9000";

// 统一代理路径列表
const proxyPaths = [
"/elasticsearch/",
"/_search-center/",
"/gateway/",
"/_info",
"/config/",
"/environments/",
"/pipeline/",
"/queue/",
"/task/",
"/tasks/",
"/debug/",
"/alerting/",
"/health",
"/stats",
"/keystore",
"/user",
"/role/",
"/permission/",
"/account/",
"/notification/",
"/agent/",
"/insight/",
"/host/",
"/_platform/",
"/migration/",
"/comparison/",
"/_license/",
"/setup/",
"/layout",
"/credential",
"/setting/",
"/email/",
"/data/",
"/instance",
"/collection/",
];

// 生成代理配置，统一加上 secure: false
const proxy = proxyPaths.reduce(function(acc, path) {
acc[path] = {
target: ProxyTarget,
changeOrigin: true,
secure: false, // 忽略自签名证书
};
return acc;
}, {});

export default {
// add for transfer to umi
plugins: [
[
"umi-plugin-react",
{
antd: true,
dva: {
hmr: true,
},
targets: {
ie: 11,
},
dva: { hmr: true },
targets: { ie: 11 },
locale: {
enable: true, // default false
default: "en-US", // default zh-CN
baseNavigator: true, // default true, when it is true, will use `navigator.language` overwrite default
enable: true,
default: "en-US",
baseNavigator: true,
},
dynamicImport: {
loadingComponent: "./components/PageLoading/index",
Expand All @@ -39,17 +83,8 @@ export default {
: {}),
},
],
// [
// 'umi-plugin-ga',
// {
// code: 'UA-12123-6',
// judge: () => process.env.APP_TYPE === 'site',
// },
// ],
],
targets: {
ie: 11,
},
targets: { ie: 11 },
define: {
APP_TYPE: process.env.APP_TYPE || "",
ENV: process.env.NODE_ENV,
Expand All @@ -59,170 +94,16 @@ export default {
APP_AUTHOR: packageJson.author,
APP_OFFICIAL_WEBSITE: packageJson.official_website || "",
},
// 路由配置
routes: pageRoutes,
// Theme for antd
// https://ant.design/docs/react/customize-theme-cn
theme: {
"primary-color": defaultSettings.primaryColor,
},
externals: {
// '@antv/data-set': 'DataSet',
},
proxy: {
"/elasticsearch/": {
target: ProxyTarget,
changeOrigin: true,
},
"/_search-center/": {
target: ProxyTarget,
changeOrigin: true,
},
"/static/": {
target: ProxyTarget,
changeOrigin: true,
},
"/gateway/": {
target: ProxyTarget,
changeOrigin: true,
},
"/_info": {
target: ProxyTarget,
changeOrigin: true,
},
"/config/": {
target: ProxyTarget,
changeOrigin: true,
},
"/environments/": {
target: ProxyTarget,
changeOrigin: true,
},
"/pipeline/": {
target: ProxyTarget,
changeOrigin: true,
},
"/queue/": {
target: ProxyTarget,
changeOrigin: true,
},
"/task/": {
target: ProxyTarget,
changeOrigin: true,
},
"/tasks/": {
target: ProxyTarget,
changeOrigin: true,
},
"/debug/": {
target: ProxyTarget,
changeOrigin: true,
},
"/alerting/": {
target: ProxyTarget,
changeOrigin: true,
},
"/health": {
target: ProxyTarget,
changeOrigin: true,
},
"/stats": {
target: ProxyTarget,
changeOrigin: true,
},
"/keystore": {
target: ProxyTarget,
changeOrigin: true,
},
"/user": {
target: ProxyTarget,
changeOrigin: true,
},
"/role/": {
target: ProxyTarget,
changeOrigin: true,
},
"/permission/": {
target: ProxyTarget,
changeOrigin: true,
},
"/account/": {
target: ProxyTarget,
changeOrigin: true,
},
"/notification/": {
target: ProxyTarget,
changeOrigin: true,
},
"/agent/": {
target: ProxyTarget,
changeOrigin: true,
},
"/insight/": {
target: ProxyTarget,
changeOrigin: true,
},
"/host/": {
target: ProxyTarget,
changeOrigin: true,
},
"/_platform/": {
target: ProxyTarget,
changeOrigin: true,
},
"/migration/": {
target: ProxyTarget,
changeOrigin: true,
},
"/comparison/": {
target: ProxyTarget,
changeOrigin: true,
},
"/_license/": {
target: ProxyTarget,
changeOrigin: true,
},
"/setup/": {
target: ProxyTarget,
changeOrigin: true,
},
"/layout": {
target: ProxyTarget,
changeOrigin: true,
},
"/credential": {
target: ProxyTarget,
changeOrigin: true,
},
"/setting": {
target: ProxyTarget,
changeOrigin: true,
},
"/email": {
target: ProxyTarget,
changeOrigin: true,
},
"/data": {
target: ProxyTarget,
changeOrigin: true,
},
"/instance": {
target: ProxyTarget,
changeOrigin: true,
},
"/collection": {
target: ProxyTarget,
changeOrigin: true,
},
},
theme: { "primary-color": defaultSettings.primaryColor },
proxy: proxy,
ignoreMomentLocale: true,
lessLoaderOptions: {
javascriptEnabled: true,
},
...(process.env.NODE_ENV === "production" ? { devtool: false } : {}),
lessLoaderOptions: { javascriptEnabled: true },
disableRedirectHoist: true,
cssLoaderOptions: {
modules: true,
getLocalIdent: (context, localIdentName, localName) => {
getLocalIdent: function(context, localIdentName, localName) {
if (
context.resourcePath.includes("node_modules") ||
context.resourcePath.includes("ant.design.pro.less") ||
Expand All @@ -236,33 +117,19 @@ export default {
const antdProPath = match[1].replace(".less", "");
const arr = antdProPath
.split("/")
.map((a) => a.replace(/([A-Z])/g, "-$1"))
.map((a) => a.toLowerCase());
.map(function(a) { return a.replace(/([A-Z])/g, "-$1"); })
.map(function(a) { return a.toLowerCase(); });
return `antd-pro${arr.join("-")}-${localName}`.replace(/--/g, "-");
}
return localName;
},
},

// chainWebpack: webpackPlugin,
cssnano: {
mergeRules: false,
},

// extra configuration for egg
cssnano: { mergeRules: false },
runtimePublicPath: true,
hash: true,
outputPath: "../.public",
manifest: {
fileName: "../.public/manifest.json",
publicPath: "",
},

manifest: { fileName: "../.public/manifest.json", publicPath: "" },
copy: ["./src/assets/favicon.ico"],
history: "hash",
// exportStatic: {
// // htmlSuffix: true,
// dynamicRoot: true,
// },
sass: {},
};
41 changes: 37 additions & 4 deletions web/config/router.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
import fs from 'fs';
import path from 'path';

const pluginRoutes = [];

const pluginRoutePath = path.resolve('config','router.enterprise.js');
if (fs.existsSync(pluginRoutePath)) {
pluginRoutes.push(...require(pluginRoutePath).default);
}

export default [
// user
{
Expand Down Expand Up @@ -155,7 +165,7 @@ export default [
},
],
},

...pluginRoutes,
// alerting
{
path: "/alerting",
Expand Down Expand Up @@ -277,6 +287,11 @@ export default [
"agent.instance:read",
],
routes: [
{
path: "/resource/runtime",
hideInMenu: true,
hideInBreadcrumb: true,
},
{
path: "/resource/runtime/instance/new",
name: "runtime.new_instance",
Expand Down Expand Up @@ -381,6 +396,8 @@ export default [
name: "system",
icon: "setting",
authority: [
"system.cluster:all",
"system.cluster:read",
"system.credential:all",
"system.credential:read",
"system.security:all",
Expand All @@ -391,11 +408,27 @@ export default [
"system.smtp_server:read"
],
routes: [
{
path: "/system/settings",
name: "settings",
component: "./System/Settings/index",
authority: [
"system.cluster:all",
"system.cluster:read",
"system.smtp_server:all",
"system.smtp_server:read",
],
},
{
path: "/system/email_server",
name: "smtp_server",
component: "./System/Email/Server",
authority: ["system.smtp_server:all", "system.smtp_server:read"],
component: "./System/Settings/index",
hideInMenu: true,
authority: [
"system.cluster:all",
"system.cluster:read",
"system.smtp_server:all",
"system.smtp_server:read",
],
},
{
path: "/system/credential",
Expand Down
Loading
Loading