mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
[~] add configurable timezone
Signed-off-by: Arthur Knoepflin <arthur@knoepflin.eu>
This commit is contained in:
parent
e560baa2d0
commit
dad485b39d
@ -224,6 +224,7 @@
|
|||||||
"mobx-react": "^6.2.2",
|
"mobx-react": "^6.2.2",
|
||||||
"mock-fs": "^4.12.0",
|
"mock-fs": "^4.12.0",
|
||||||
"moment": "^2.26.0",
|
"moment": "^2.26.0",
|
||||||
|
"moment-timezone": "^0.5.33",
|
||||||
"node-pty": "^0.9.0",
|
"node-pty": "^0.9.0",
|
||||||
"npm": "^6.14.8",
|
"npm": "^6.14.8",
|
||||||
"openid-client": "^3.15.2",
|
"openid-client": "^3.15.2",
|
||||||
|
|||||||
@ -3,6 +3,7 @@ import { app, remote } from "electron";
|
|||||||
import semver from "semver";
|
import semver from "semver";
|
||||||
import { readFile } from "fs-extra";
|
import { readFile } from "fs-extra";
|
||||||
import { action, computed, observable, reaction, toJS } from "mobx";
|
import { action, computed, observable, reaction, toJS } from "mobx";
|
||||||
|
import moment from "moment-timezone";
|
||||||
import { BaseStore } from "./base-store";
|
import { BaseStore } from "./base-store";
|
||||||
import migrations from "../migrations/user-store";
|
import migrations from "../migrations/user-store";
|
||||||
import { getAppVersion } from "./utils/app-version";
|
import { getAppVersion } from "./utils/app-version";
|
||||||
@ -23,6 +24,7 @@ export interface UserPreferences {
|
|||||||
httpsProxy?: string;
|
httpsProxy?: string;
|
||||||
shell?: string;
|
shell?: string;
|
||||||
colorTheme?: string;
|
colorTheme?: string;
|
||||||
|
localeTimezone?: string;
|
||||||
allowUntrustedCAs?: boolean;
|
allowUntrustedCAs?: boolean;
|
||||||
allowTelemetry?: boolean;
|
allowTelemetry?: boolean;
|
||||||
downloadMirror?: string | "default";
|
downloadMirror?: string | "default";
|
||||||
@ -54,6 +56,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
allowTelemetry: true,
|
allowTelemetry: true,
|
||||||
allowUntrustedCAs: false,
|
allowUntrustedCAs: false,
|
||||||
colorTheme: UserStore.defaultTheme,
|
colorTheme: UserStore.defaultTheme,
|
||||||
|
localeTimezone: moment.tz.guess(true),
|
||||||
downloadMirror: "default",
|
downloadMirror: "default",
|
||||||
downloadKubectlBinaries: true, // Download kubectl binaries matching cluster version
|
downloadKubectlBinaries: true, // Download kubectl binaries matching cluster version
|
||||||
openAtLogin: false,
|
openAtLogin: false,
|
||||||
@ -75,7 +78,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
|
|||||||
|
|
||||||
// open at system start-up
|
// open at system start-up
|
||||||
reaction(() => this.preferences.openAtLogin, openAtLogin => {
|
reaction(() => this.preferences.openAtLogin, openAtLogin => {
|
||||||
app.setLoginItemSettings({
|
app.setLoginItemSettings({
|
||||||
openAtLogin,
|
openAtLogin,
|
||||||
openAsHidden: true,
|
openAsHidden: true,
|
||||||
args: ["--hidden"]
|
args: ["--hidden"]
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import "./preferences.scss";
|
import "./preferences.scss";
|
||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
import moment from "moment-timezone";
|
||||||
import { computed, observable, reaction } from "mobx";
|
import { computed, observable, reaction } from "mobx";
|
||||||
import { disposeOnUnmount, observer } from "mobx-react";
|
import { disposeOnUnmount, observer } from "mobx-react";
|
||||||
|
|
||||||
@ -40,6 +41,13 @@ export class Preferences extends React.Component {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@computed get timezoneOptions(): SelectOption<string>[] {
|
||||||
|
return moment.tz.names().map(zone => ({
|
||||||
|
label: zone,
|
||||||
|
value: zone,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
disposeOnUnmount(this, [
|
disposeOnUnmount(this, [
|
||||||
reaction(() => navigation.location.hash, hash => {
|
reaction(() => navigation.location.hash, hash => {
|
||||||
@ -95,7 +103,7 @@ export class Preferences extends React.Component {
|
|||||||
const { preferences } = userStore;
|
const { preferences } = userStore;
|
||||||
const extensions = appPreferenceRegistry.getItems();
|
const extensions = appPreferenceRegistry.getItems();
|
||||||
const telemetryExtensions = extensions.filter(e => e.showInPreferencesTab == Pages.Telemetry);
|
const telemetryExtensions = extensions.filter(e => e.showInPreferencesTab == Pages.Telemetry);
|
||||||
let defaultShell = process.env.SHELL || process.env.PTYSHELL;
|
let defaultShell = process.env.SHELL || process.env.PTYSHELL;
|
||||||
|
|
||||||
if (!defaultShell) {
|
if (!defaultShell) {
|
||||||
if (isWindows) {
|
if (isWindows) {
|
||||||
@ -153,6 +161,18 @@ export class Preferences extends React.Component {
|
|||||||
label="Automatically start Lens on login"
|
label="Automatically start Lens on login"
|
||||||
/>
|
/>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<hr />
|
||||||
|
|
||||||
|
<section id="locale">
|
||||||
|
<SubTitle title="Locale Timezone" />
|
||||||
|
<Select
|
||||||
|
options={this.timezoneOptions}
|
||||||
|
value={preferences.localeTimezone}
|
||||||
|
onChange={({ value }: SelectOption) => preferences.localeTimezone = value}
|
||||||
|
themeName="lens"
|
||||||
|
/>
|
||||||
|
</section>
|
||||||
</section>
|
</section>
|
||||||
)}
|
)}
|
||||||
{this.activeTab == Pages.Proxy && (
|
{this.activeTab == Pages.Proxy && (
|
||||||
|
|||||||
12
yarn.lock
12
yarn.lock
@ -9538,6 +9538,18 @@ mock-fs@^4.12.0:
|
|||||||
resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.12.0.tgz#a5d50b12d2d75e5bec9dac3b67ffe3c41d31ade4"
|
resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.12.0.tgz#a5d50b12d2d75e5bec9dac3b67ffe3c41d31ade4"
|
||||||
integrity sha512-/P/HtrlvBxY4o/PzXY9cCNBrdylDNxg7gnrv2sMNxj+UJ2m8jSpl0/A6fuJeNAWr99ZvGWH8XCbE0vmnM5KupQ==
|
integrity sha512-/P/HtrlvBxY4o/PzXY9cCNBrdylDNxg7gnrv2sMNxj+UJ2m8jSpl0/A6fuJeNAWr99ZvGWH8XCbE0vmnM5KupQ==
|
||||||
|
|
||||||
|
moment-timezone@^0.5.33:
|
||||||
|
version "0.5.33"
|
||||||
|
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
|
||||||
|
integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==
|
||||||
|
dependencies:
|
||||||
|
moment ">= 2.9.0"
|
||||||
|
|
||||||
|
"moment@>= 2.9.0":
|
||||||
|
version "2.29.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
|
||||||
|
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
|
||||||
|
|
||||||
moment@^2.10.2, moment@^2.26.0:
|
moment@^2.10.2, moment@^2.26.0:
|
||||||
version "2.26.0"
|
version "2.26.0"
|
||||||
resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
|
resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user