diff --git a/package.json b/package.json index d24e16521a..551e36f6aa 100644 --- a/package.json +++ b/package.json @@ -216,11 +216,11 @@ "@hapi/subtext": "^7.0.4", "@kubernetes/client-node": "^0.17.0", "@material-ui/styles": "^4.11.5", - "@ogre-tools/fp": "9.0.1", - "@ogre-tools/injectable": "9.0.2", - "@ogre-tools/injectable-extension-for-auto-registration": "9.0.2", - "@ogre-tools/injectable-extension-for-mobx": "9.0.2", - "@ogre-tools/injectable-react": "9.0.2", + "@ogre-tools/fp": "9.0.3", + "@ogre-tools/injectable": "9.0.3", + "@ogre-tools/injectable-extension-for-auto-registration": "9.0.3", + "@ogre-tools/injectable-extension-for-mobx": "9.0.3", + "@ogre-tools/injectable-react": "9.0.3", "@sentry/electron": "^3.0.7", "@sentry/integrations": "^6.19.3", "@side/jest-runtime": "^1.0.1", diff --git a/src/renderer/components/dock/create-resource/view.tsx b/src/renderer/components/dock/create-resource/view.tsx index 711397c752..a9245e4494 100644 --- a/src/renderer/components/dock/create-resource/view.tsx +++ b/src/renderer/components/dock/create-resource/view.tsx @@ -11,7 +11,6 @@ import type { IComputedValue } from "mobx"; import { makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; import type { CreateResourceTabStore } from "./store"; -import type { DockTab } from "../dock/store"; import { EditorPanel } from "../editor-panel"; import { InfoPanel } from "../info-panel"; import * as resourceApplierApi from "../../../../common/k8s-api/endpoints/resource-applier.api"; @@ -31,7 +30,7 @@ import getDetailsUrlInjectable from "../../kube-detail-params/get-details-url.in import navigateInjectable from "../../../navigation/navigate.injectable"; export interface CreateResourceProps { - tab: DockTab; + tabId: string; } interface Dependencies { @@ -52,7 +51,7 @@ class NonInjectedCreateResource extends React.Component { renderTab(tab: DockTab) { switch (tab.kind) { case TabKind.CREATE_RESOURCE: - return ; + return ; case TabKind.EDIT_RESOURCE: - return ; + return ; case TabKind.INSTALL_CHART: - return ; + return ; case TabKind.UPGRADE_CHART: return ; case TabKind.POD_LOGS: diff --git a/src/renderer/components/dock/edit-resource/view.tsx b/src/renderer/components/dock/edit-resource/view.tsx index 35714d2d24..d448a86ce8 100644 --- a/src/renderer/components/dock/edit-resource/view.tsx +++ b/src/renderer/components/dock/edit-resource/view.tsx @@ -5,7 +5,6 @@ import React from "react"; import { observer } from "mobx-react"; -import type { DockTab } from "../dock/store"; import { Spinner } from "../../spinner"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { EditResourceModel } from "./edit-resource-model/edit-resource-model.injectable"; @@ -16,7 +15,7 @@ import { Badge } from "../../badge"; import { Notice } from "../../+extensions/notice"; export interface EditResourceProps { - tab: DockTab; + tabId: string; } interface Dependencies { @@ -24,7 +23,7 @@ interface Dependencies { } const NonInjectedEditResource = observer( - ({ model, tab: { id: tabId }}: EditResourceProps & Dependencies) => { + ({ model, tabId }: EditResourceProps & Dependencies) => { return (
{model.shouldShowErrorAboutNoResource && ( @@ -78,7 +77,7 @@ export const EditResource = withInjectables( ), getProps: async (di, props) => ({ - model: await di.inject(editResourceModelInjectable, props.tab.id), + model: await di.inject(editResourceModelInjectable, props.tabId), ...props, }), }, diff --git a/src/renderer/components/dock/install-chart/view.tsx b/src/renderer/components/dock/install-chart/view.tsx index 282acce6d8..98914b88e3 100644 --- a/src/renderer/components/dock/install-chart/view.tsx +++ b/src/renderer/components/dock/install-chart/view.tsx @@ -7,7 +7,6 @@ import "./install-chart.scss"; import React from "react"; import { observer } from "mobx-react"; -import type { DockTab } from "../dock/store"; import { InfoPanel } from "../info-panel"; import { Badge } from "../../badge"; import { NamespaceSelect } from "../../+namespaces/namespace-select"; @@ -23,8 +22,8 @@ import type { InstallChartModel } from "./install-chart-model.injectable"; import installChartModelInjectable from "./install-chart-model.injectable"; import { Spinner } from "../../spinner"; -export interface InstallCharProps { - tab: DockTab; +export interface InstallChartProps { + tabId: string; } interface Dependencies { @@ -32,7 +31,7 @@ interface Dependencies { } const NonInjectedInstallChart = observer( - ({ model: model, tab: { id: tabId }}: InstallCharProps & Dependencies) => { + ({ model: model, tabId }: InstallChartProps & Dependencies) => { const installed = model.installed.get(); if (installed) { @@ -144,7 +143,7 @@ const NonInjectedInstallChart = observer( }, ); -export const InstallChart = withInjectables( +export const InstallChart = withInjectables( NonInjectedInstallChart, { @@ -156,7 +155,7 @@ export const InstallChart = withInjectables( ), getProps: async (di, props) => ({ - model: await di.inject(installChartModelInjectable, props.tab.id), + model: await di.inject(installChartModelInjectable, props.tabId), ...props, }), }, diff --git a/yarn.lock b/yarn.lock index fadbf98db0..2d02e3af4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1235,53 +1235,46 @@ mkdirp "^1.0.4" rimraf "^3.0.2" -"@ogre-tools/fp@9.0.1": - version "9.0.1" - resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-9.0.1.tgz#22c23bd209f6f56bf66a5ff4514930334a3a4782" - integrity sha512-7kORUcvR9DZz5/2qDSSKExGeisXzfmOafP+Z6l8C+WQXEmEQm7CmFMyBEyMkei0eNFzNghlKYgRFpsvBdU3KAg== +"@ogre-tools/fp@9.0.3", "@ogre-tools/fp@^9.0.3": + version "9.0.3" + resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-9.0.3.tgz#f8c9a3316b688c4782309e050c86aa04bebfc293" + integrity sha512-j5TQAxiz6ncEfYFBcqnWXeLZY89Qd+dZ9UlfonBdw/C9okxjNeFL+2bmt+b/Vxscz1cOLGZ1F6nmlhQdTtHzPw== dependencies: lodash "^4.17.21" -"@ogre-tools/fp@^9.0.2": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-9.0.2.tgz#9f7fbbf461c539850c5408456164a8fadb643704" - integrity sha512-HQa6YQK5EDR0Fv4tbvckrjO8VueE9uagX+TbgFE+Zq51E1cc/4VHQJGo5c6l+H/g+jvYKCfJMwbnMiFFxeDEfw== +"@ogre-tools/injectable-extension-for-auto-registration@9.0.3": + version "9.0.3" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-9.0.3.tgz#a26d2a39e24ec3a0800fe21141c0f4f0e7d5504d" + integrity sha512-0zjt4w1ACBX9a3FyhTD+/AAqk/xov2bw+Cnbte7NMOVWAbHDfQpmbdiKJlMnFcMUd8vdwOEMm1Z4ogT1VkUeqg== dependencies: + "@ogre-tools/fp" "^9.0.3" + "@ogre-tools/injectable" "^9.0.3" lodash "^4.17.21" -"@ogre-tools/injectable-extension-for-auto-registration@9.0.2": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-9.0.2.tgz#b72e0cb23ec14ef24206e1354ed65e94001f0c84" - integrity sha512-DVn2sc7L88zXHLRhXbX9H/V9KmL0kTI75PUIXdnId/0PbkiSOOdcOlSnt1qNw63pL3OQiOT1s1OuxSz8sg1MOQ== +"@ogre-tools/injectable-extension-for-mobx@9.0.3": + version "9.0.3" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-9.0.3.tgz#24a14b940f51cae8b07645a2376d804b826c659e" + integrity sha512-DgCbAIqMPKgeNETY/8nxz6llAk8fAihGcbs/fkKINe4N9zFgOBKsuk/w67Sx0rTE7l35L6HQenbo7nJhIqbCWA== dependencies: - "@ogre-tools/fp" "^9.0.2" - "@ogre-tools/injectable" "^9.0.2" + "@ogre-tools/fp" "^9.0.3" + "@ogre-tools/injectable" "^9.0.3" lodash "^4.17.21" -"@ogre-tools/injectable-extension-for-mobx@9.0.2": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-9.0.2.tgz#d1a4af35ab815390c8e773cf7696b30564ba58ba" - integrity sha512-0x5NyM/sJkqSnTA3pgXwLK+zCxnTMpQ3XiIHInzL5abtwQK3L6J7xrbCR7yRF2L+dQwTmWd/fWtrfwLtBIWVdQ== +"@ogre-tools/injectable-react@9.0.3": + version "9.0.3" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-9.0.3.tgz#bc125ef906b171c8894f711f8b61f38d49e81dd0" + integrity sha512-6O9vr19Mcy0uUekZhRyjsM5nw8pgFXhbNvZ8JOnBQg6Lp1CqdasIFhJ0Hdxb8w8P9Zs+pd8pfevRVotq0ouV2Q== dependencies: - "@ogre-tools/fp" "^9.0.2" - "@ogre-tools/injectable" "^9.0.2" + "@ogre-tools/fp" "^9.0.3" + "@ogre-tools/injectable" "^9.0.3" lodash "^4.17.21" -"@ogre-tools/injectable-react@9.0.2": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-9.0.2.tgz#e8148268a755e30587cb1c27a5c500b247b0c5d0" - integrity sha512-IIEq8GoCXDoGLWOH62F/ZWduk5TAObDn+K5VuayCnfnLGmAEw+A7rTh6bJhjhGAH8DblX9xr+BLjs0SPgxzMpA== +"@ogre-tools/injectable@9.0.3", "@ogre-tools/injectable@^9.0.3": + version "9.0.3" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-9.0.3.tgz#6d9e01a5be7e7c96e7bcbc727f928faad5e11884" + integrity sha512-KCmqcMEl/1Jjwg6XzNve+JVaW/OtiJUOKBucTJx2ZKBlAQaKz1/VUP7IB4UoQ4RWVa0+mUKLTxBTQFBQfp05RA== dependencies: - "@ogre-tools/fp" "^9.0.2" - "@ogre-tools/injectable" "^9.0.2" - lodash "^4.17.21" - -"@ogre-tools/injectable@9.0.2", "@ogre-tools/injectable@^9.0.2": - version "9.0.2" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-9.0.2.tgz#a00aebf648c1b8d08cd05641d348e44e43f4f7a5" - integrity sha512-0msgHvssOqeEPmW0i56jUz1Yp7fiApXfxII/dhdkQrG2tnb4brgW3WXP1841xt2q6Hf769+HXON2bhBsawohAw== - dependencies: - "@ogre-tools/fp" "^9.0.2" + "@ogre-tools/fp" "^9.0.3" lodash "^4.17.21" "@pmmmwh/react-refresh-webpack-plugin@^0.5.7":