Merge remote-tracking branch 'origin/master' into mobx-6.2

# Conflicts:
#	src/common/hotbar-store.ts
#	src/extensions/extension-discovery.ts
#	src/renderer/components/+apps-helm-charts/helm-chart-details.tsx
#	src/renderer/components/+apps-helm-charts/helm-chart.store.ts
#	src/renderer/components/+catalog/catalog.tsx
#	src/renderer/components/+extensions/extensions.tsx
#	src/renderer/components/confirm-dialog/confirm-dialog.tsx
#	src/renderer/components/hotbar/hotbar-icon.tsx
#	src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx
#	src/renderer/components/layout/sidebar.tsx
This commit is contained in:
Roman committed 2021-04-27 12:32:29 +03:00
commit e93bca5169
81 files changed
+2319 -2116

No files matched your search

+2 -2
View File
@@ -1,6 +1,6 @@
import { app, remote } from "electron";
import winston from "winston";
import { isDebugging } from "../common/vars";
import { isDebugging, isTestEnv } from "../common/vars";
const logLevel = process.env.LOG_LEVEL ? process.env.LOG_LEVEL : isDebugging ? "debug" : "info";
const consoleOptions: winston.transports.ConsoleTransportOptions = {
@@ -23,7 +23,7 @@ const logger = winston.createLogger({
),
transports: [
new winston.transports.Console(consoleOptions),
new winston.transports.File(fileOptions),
...(isTestEnv ? [] : [new winston.transports.File(fileOptions)]),
],
});
+3 -3
View File
@@ -4,7 +4,7 @@ import { WindowManager } from "./window-manager";
import { appName, isMac, isWindows, isTestEnv, docsUrl, supportUrl, productName } from "../common/vars";
import { addClusterURL } from "../renderer/components/+add-cluster/add-cluster.route";
import { preferencesURL } from "../renderer/components/+preferences/preferences.route";
import { whatsNewURL } from "../renderer/components/+whats-new/whats-new.route";
import { welcomeURL } from "../renderer/components/+welcome/welcome.route";
import { extensionsURL } from "../renderer/components/+extensions/extensions.route";
import { catalogURL } from "../renderer/components/+catalog/catalog.route";
import { menuRegistry } from "../extensions/registries/menu-registry";
@@ -201,9 +201,9 @@ export function buildMenu(windowManager: WindowManager) {
role: "help",
submenu: [
{
label: "What's new?",
label: "Welcome",
click() {
navigate(whatsNewURL());
navigate(welcomeURL());
},
},
{