From e7b3b00db7dc8c431accaff138dd8d9814b10275 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Oct 2021 01:04:44 +0000 Subject: [PATCH] Bump mobx from 6.3.0 to 6.3.5 Bumps [mobx](https://github.com/mobxjs/mobx) from 6.3.0 to 6.3.5. - [Release notes](https://github.com/mobxjs/mobx/releases) - [Commits](https://github.com/mobxjs/mobx/compare/mobx@6.3.0...mobx@6.3.5) --- updated-dependencies: - dependency-name: mobx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- src/common/base-store.ts | 12 +++++++++++- .../components/+namespaces/namespace.store.ts | 5 +++-- .../delete-cluster-dialog/delete-cluster-dialog.tsx | 9 +++------ src/renderer/components/dock/dock.store.ts | 7 ++++--- yarn.lock | 11 ++++++++--- 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index e14c8afea2..5a5b867c64 100644 --- a/package.json +++ b/package.json @@ -212,7 +212,7 @@ "mac-ca": "^1.0.6", "marked": "^2.1.3", "md5-file": "^5.0.0", - "mobx": "^6.3.0", + "mobx": "6.3.6", "mobx-observable-history": "^2.0.1", "mobx-react": "^7.2.1", "mock-fs": "^4.14.0", diff --git a/src/common/base-store.ts b/src/common/base-store.ts index 43911aff4d..5ac8ab3204 100644 --- a/src/common/base-store.ts +++ b/src/common/base-store.ts @@ -32,8 +32,18 @@ import { isTestEnv } from "./vars"; import { kebabCase } from "lodash"; import { AppPaths } from "./app-paths"; +/** + * Removing the generic boolean type from `IReactionOptions` + */ +export type ReactionOptions = IReactionOptions; + +/** + * A form of `IReactionOptions` which disallows changing the equality function + */ +export type ChangeOptions = Omit, "equals">; + export interface BaseStoreParams extends ConfOptions { - syncOptions?: IReactionOptions; + syncOptions?: ReactionOptions; } /** diff --git a/src/renderer/components/+namespaces/namespace.store.ts b/src/renderer/components/+namespaces/namespace.store.ts index 093a3301ae..e365a587ad 100644 --- a/src/renderer/components/+namespaces/namespace.store.ts +++ b/src/renderer/components/+namespaces/namespace.store.ts @@ -19,11 +19,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { action, comparer, computed, IReactionDisposer, IReactionOptions, makeObservable, reaction } from "mobx"; +import { action, comparer, computed, IReactionDisposer, makeObservable, reaction } from "mobx"; import { autoBind, createStorage, noop, ToggleSet } from "../../utils"; import { KubeObjectStore, KubeObjectStoreLoadingParams } from "../../../common/k8s-api/kube-object.store"; import { Namespace, namespacesApi } from "../../../common/k8s-api/endpoints/namespaces.api"; import { apiManager } from "../../../common/k8s-api/api-manager"; +import type { ReactionOptions } from "../../../common/base-store"; export class NamespaceStore extends KubeObjectStore { api = namespacesApi; @@ -45,7 +46,7 @@ export class NamespaceStore extends KubeObjectStore { this.autoLoadAllowedNamespaces(); } - public onContextChange(callback: (namespaces: string[]) => void, opts: IReactionOptions = {}): IReactionDisposer { + public onContextChange(callback: (namespaces: string[]) => void, opts: ReactionOptions = {}): IReactionDisposer { return reaction(() => Array.from(this.contextNamespaces), callback, { equals: comparer.shallow, ...opts, diff --git a/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog.tsx b/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog.tsx index 458216f6d7..c677a8995c 100644 --- a/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog.tsx +++ b/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog.tsx @@ -52,15 +52,12 @@ type Props = {}; @observer export class DeleteClusterDialog extends React.Component { - showContextSwitch = false; - newCurrentContext = ""; + @observable showContextSwitch = false; + @observable newCurrentContext = ""; constructor(props: Props) { super(props); - makeObservable(this, { - showContextSwitch: observable, - newCurrentContext: observable, - }); + makeObservable(this); } static open({ config, cluster }: Partial) { diff --git a/src/renderer/components/dock/dock.store.ts b/src/renderer/components/dock/dock.store.ts index 000de52dfb..8404629887 100644 --- a/src/renderer/components/dock/dock.store.ts +++ b/src/renderer/components/dock/dock.store.ts @@ -20,10 +20,11 @@ */ import * as uuid from "uuid"; -import { action, computed, IReactionOptions, makeObservable, observable, reaction } from "mobx"; +import { action, computed, makeObservable, observable, reaction } from "mobx"; import { autoBind, createStorage } from "../../utils"; import throttle from "lodash/throttle"; import { monacoModelsManager } from "./monaco-model-manager"; +import type { ChangeOptions, ReactionOptions } from "../../../common/base-store"; export type TabId = string; @@ -181,11 +182,11 @@ export class DockStore implements DockStorageState { if (this.height > this.maxHeight) this.height = this.maxHeight; } - onResize(callback: () => void, options?: IReactionOptions) { + onResize(callback: () => void, options?: ChangeOptions) { return reaction(() => [this.height, this.fullSize], callback, options); } - onTabChange(callback: (tabId: TabId) => void, options?: IReactionOptions) { + onTabChange(callback: (tabId: TabId) => void, options?: ReactionOptions) { return reaction(() => this.selectedTabId, callback, options); } diff --git a/yarn.lock b/yarn.lock index b7cc47897d..2fb28e771c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9562,10 +9562,15 @@ mobx-react@^7.2.1: dependencies: mobx-react-lite "^3.2.0" +mobx@6.3.6: + version "6.3.6" + resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.3.6.tgz#3192dea21ae8213d04a0df5c98a5ca164ed29ecd" + integrity sha512-TeCp8BTco5cmXKY7Zt5VSL5fHBEAHTSA6xs+KWmcxi3cFN1C+Xqs2m3giyGT/e6TSjtdDysVX5+cCZZhEyiJmA== + mobx@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.3.0.tgz#a8fb693c3047bdfcb1eaff9aa48e36a7eb084f96" - integrity sha512-Aa1+VXsg4WxqJMTQfWoYuJi5UD10VZhiobSmcs5kcmI3BIT0aVtn7DysvCeDADCzl7dnbX+0BTHUj/v7gLlZpQ== + version "6.3.5" + resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.3.5.tgz#4464565bf2fa0f74f5dc2e4d6a9713bcee0ddf9c" + integrity sha512-MeDfqtiSbhVoJgXqQsrJwvq2klj7Xk9pPdMThCdFiwFt33vgWJe82ATppPwVzQoz0AI3QpSSwQzcp3TBDK4syg== mock-fs@^4.14.0: version "4.14.0"