mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Turn on strict mode in tsconfig.json, some helpful lints, and required cleanup where strictness necessitates it (#5195)
* Turn on strict mode in tsconfig.json - Add route, clusterRoute, and payloadValidatedClusterRoute helper functions to improve types with backend routes - Turn on the following new lints: - react/jsx-first-prop-new-line - react/jsx-wrap-multilines - react/jsx-one-expression-per-line - react/jsx-max-props-per-line - react/jsx-indent - react/jsx-indent-props Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace KubeObject scope strings with enum Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert package.json version changes Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move hostedCluster(Id) Signed-off-by: Sebastian Malton <sebastian@malton.name> * change some type param names to be not single letters Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove copy-extension-themes Signed-off-by: Sebastian Malton <sebastian@malton.name> * add new make clean action Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build to not use webpack for generating types Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move fileNameMigration to index Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix ref logic error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts test by overriding createStorage to not touch file system Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster.test.ts tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube=api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixed hotbar-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kubeconfig-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix daemonset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicaset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulsets/dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicasets/scale-dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments/scale/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cronjob.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stateful-set.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployment.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix job.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix scroll-spy.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix welcome.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix verify-that-all-routes-have-route-component.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pod-tolerations.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * better fix for previous 3 fixes, plus also select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix app-paths.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix isReactNode typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sub-title.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix drawer.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix list-layout.tsx and header.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix error-boundary.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix upgrade-chart/store.ts and dock-tab.store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix install-chart/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix edit-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix create-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select-filter.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crd-list.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix wrong types for extensions Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency on catalogCategoryRegistry Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-kube Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors, most <Select /> errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixing more type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * some more fixing type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeApis to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * factor out into a common file all the exports Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeObjectStores to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unused legacy KubeApi globals Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bad previous commit Signed-off-by: Sebastian Malton <sebastian@malton.name> * more crash fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * try and fix behavioural tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-core.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make ThemeStore non-singleton and fix navigation-to-terminal-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-kubernetes-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-application-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-extension-specific-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-telemetry-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix closing-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts - Fix other type errors too Signed-off-by: Sebastian Malton <sebastian@malton.name> * final tweaks Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add more tsconfig files, fix bug in <Catalog> - Make all of history, navigation injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all of kube-details-params/ and navigate/ to injectable - This fixes a runtime error that was encountered during testing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix runtime errors on renderer - remove all static uses of `createPageParam` (and then removed the legacy global) - Made LensRendererExtension and LensMainExtension just used dependencies and not the getLegacyDi - Fixed circular dep in extension-loader Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move registerStore calls to after injectMany Signed-off-by: Sebastian Malton <sebastian@malton.name> * replace all the rest of the legacy uses of apiManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stack overflow and cycles in DI Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix NamespaceSelectFilter not opening Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix WizardStep and AddNamespaceDialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix KubeApi's not being registered Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup WindowManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * Proper fix for Wizard, fix NamespaceStore.subscribe Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rewrite withTooltip to be more type correct - Fixes mobx related "too many recursive actions" error - Change all the uses of withTooltips to be functional components Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add e2e test to cover kube api registration Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup internal-commands Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove cast in <Animate> Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix command-palette e2e test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type error after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix test name Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix code to help CodeQL scanner Signed-off-by: Sebastian Malton <sebastian@malton.name> * update intree extension lock files Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix build-extensions picking wrong @types/react Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix tests from rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make KubeconfigSyncManager more injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crash in test mode for Dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * make Select snapshots deterministic Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix new type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object.store.test.ts typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix merge build issues Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix snapshots after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * reexport BaseKubeJsonApiObjectMetadata Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo in terminalSpawningPool Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove duplicate license header Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo to waitUntilDefined Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove iter use from getLegacyGlobalDiForExtensionApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove complex createStorage override Signed-off-by: Sebastian Malton <sebastian@malton.name> * override logger with mocks only when needed for tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove specialized overrideStore flags for getDiForUnitTesting Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary | undefined types from the exactOptionalFieldTypes experiment Signed-off-by: Sebastian Malton <sebastian@malton.name> * use more descriptive name for local test mocks Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary addition to 'make clean' target Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove oddity of KubeObjectStore.getById(undefined) being allowed Signed-off-by: Sebastian Malton <sebastian@malton.name> * rename KubeObject.getDescriptor in favour of name without fundemental JS meaning Signed-off-by: Sebastian Malton <sebastian@malton.name> * Simplify legacyRegisterApi when working in behaviour unit tests - Don't emit within main environment as there should be no auto registering there Signed-off-by: Sebastian Malton <sebastian@malton.name> * change confusing variable name in ReactiveDuration Signed-off-by: Sebastian Malton <sebastian@malton.name> * make visitor pattern more explicit for Entity contextMenuOpen Signed-off-by: Sebastian Malton <sebastian@malton.name> * toggleDetails -> toggleKubeDetailsPane is more specific Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove outdated comment Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bug where LensExtension dependencies are not set Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests from the revert of react 18 Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix more tests from merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typings with new is-compatible-extension tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * more type fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert in-tree extension versions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve name of guarding injectable for stores and apis - New name better implies that it is just a guard state and does not do anything Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add helper for <Select>.isMulti for storing in a Set<Value> Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix is-compatible-extension.test.ts types Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
1 parent
381d77c633
commit
dfcb7c3330
1062 files changed
+26512
-28689
No files matched your search
@@ -3,8 +3,9 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
|
||||
import type {
|
||||
IReleaseCreatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
HelmReleaseCreatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import {
|
||||
createRelease,
|
||||
} from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
@@ -16,7 +17,7 @@ const createReleaseInjectable = getInjectable({
|
||||
instantiate: (di) => {
|
||||
const releases = di.inject(releasesInjectable);
|
||||
|
||||
return async (payload: IReleaseCreatePayload) => {
|
||||
return async (payload: HelmReleaseCreatePayload) => {
|
||||
const release = await createRelease(payload);
|
||||
|
||||
releases.invalidate();
|
||||
|
||||
File renamed without changes.
@@ -0,0 +1,147 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import "./dialog.scss";
|
||||
|
||||
import React from "react";
|
||||
import type { IObservableValue } from "mobx";
|
||||
import { computed, observable, runInAction } from "mobx";
|
||||
import { observer } from "mobx-react";
|
||||
import type { DialogProps } from "../../dialog";
|
||||
import { Dialog } from "../../dialog";
|
||||
import { Wizard, WizardStep } from "../../wizard";
|
||||
import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import { getReleaseHistory, type HelmReleaseRevision } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import { Select } from "../../select";
|
||||
import { Notifications } from "../../notifications";
|
||||
import orderBy from "lodash/orderBy";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import releaseRollbackDialogStateInjectable from "./state.injectable";
|
||||
import rollbackReleaseInjectable from "../rollback-release/rollback-release.injectable";
|
||||
|
||||
export interface ReleaseRollbackDialogProps extends DialogProps {
|
||||
}
|
||||
|
||||
interface Dependencies {
|
||||
rollbackRelease: (releaseName: string, namespace: string, revisionNumber: number) => Promise<void>;
|
||||
state: IObservableValue<HelmRelease | undefined>;
|
||||
}
|
||||
|
||||
@observer
|
||||
class NonInjectedReleaseRollbackDialog extends React.Component<ReleaseRollbackDialogProps & Dependencies> {
|
||||
readonly isLoading = observable.box(false);
|
||||
readonly revision = observable.box<HelmReleaseRevision | undefined>();
|
||||
readonly revisions = observable.array<HelmReleaseRevision>();
|
||||
readonly revisionOptions = computed(() => (
|
||||
this.revisions.map(revision => ({
|
||||
value: revision,
|
||||
label: `${revision.revision} - ${revision.chart} - ${revision.app_version}, updated: ${new Date(revision.updated).toLocaleString()}`,
|
||||
}))
|
||||
));
|
||||
|
||||
close = () => {
|
||||
this.props.state.set(undefined);
|
||||
};
|
||||
|
||||
onOpen = async (release: HelmRelease) => {
|
||||
this.isLoading.set(true);
|
||||
|
||||
const releases = await getReleaseHistory(release.getName(), release.getNs());
|
||||
|
||||
runInAction(() => {
|
||||
this.revisions.replace(orderBy(releases, "revision", "desc"));
|
||||
this.revision.set(this.revisions[0]);
|
||||
this.isLoading.set(false);
|
||||
});
|
||||
};
|
||||
|
||||
rollback = async (release: HelmRelease) => {
|
||||
const revision = this.revision.get();
|
||||
|
||||
if (!revision) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await this.props.rollbackRelease(release.getName(), release.getNs(), revision.revision);
|
||||
this.close();
|
||||
} catch (err) {
|
||||
Notifications.checkedError(err, "Unknown error occured while rolling back release");
|
||||
}
|
||||
};
|
||||
|
||||
renderRevisionContent() {
|
||||
const revision = this.revision.get();
|
||||
|
||||
if (!revision) {
|
||||
return <p>No revisions to rollback.</p>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex gaps align-center">
|
||||
<b>Revision</b>
|
||||
<Select
|
||||
id="revision-input"
|
||||
themeName="light"
|
||||
value={revision}
|
||||
options={this.revisionOptions.get()}
|
||||
onChange={option => this.revision.set(option?.value)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
renderContent(release: HelmRelease) {
|
||||
return (
|
||||
<Wizard
|
||||
header={(
|
||||
<h5>
|
||||
Rollback
|
||||
<b>{release.getName()}</b>
|
||||
</h5>
|
||||
)}
|
||||
done={this.close}
|
||||
>
|
||||
<WizardStep
|
||||
scrollable={false}
|
||||
nextLabel="Rollback"
|
||||
next={() => this.rollback(release)}
|
||||
loading={this.isLoading.get()}
|
||||
>
|
||||
{this.renderRevisionContent()}
|
||||
</WizardStep>
|
||||
</Wizard>
|
||||
);
|
||||
}
|
||||
|
||||
render() {
|
||||
const { state, ...dialogProps } = this.props;
|
||||
const release = state.get();
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
{...dialogProps}
|
||||
className="ReleaseRollbackDialog"
|
||||
isOpen={Boolean(release)}
|
||||
onOpen={release ? (() => this.onOpen(release)) : undefined}
|
||||
close={this.close}
|
||||
>
|
||||
{release && this.renderContent(release)}
|
||||
</Dialog>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export const ReleaseRollbackDialog = withInjectables<Dependencies, ReleaseRollbackDialogProps>(
|
||||
NonInjectedReleaseRollbackDialog,
|
||||
|
||||
{
|
||||
getProps: (di, props) => ({
|
||||
rollbackRelease: di.inject(rollbackReleaseInjectable),
|
||||
state: di.inject(releaseRollbackDialogStateInjectable),
|
||||
...props,
|
||||
}),
|
||||
},
|
||||
);
|
||||
@@ -0,0 +1,21 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import releaseRollbackDialogStateInjectable from "./state.injectable";
|
||||
|
||||
export type OpenHelmReleaseRollbackDialog = (release: HelmRelease) => void;
|
||||
|
||||
const openHelmReleaseRollbackDialogInjectable = getInjectable({
|
||||
id: "open-helm-release-dialog",
|
||||
instantiate: (di): OpenHelmReleaseRollbackDialog => {
|
||||
const state = di.inject(releaseRollbackDialogStateInjectable);
|
||||
|
||||
return release => state.set(release);
|
||||
},
|
||||
});
|
||||
|
||||
export default openHelmReleaseRollbackDialogInjectable;
|
||||
@@ -0,0 +1,14 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { observable } from "mobx";
|
||||
import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
|
||||
const releaseRollbackDialogStateInjectable = getInjectable({
|
||||
id: "release-rollback-dialog-state",
|
||||
instantiate: () => observable.box<HelmRelease | undefined>(undefined),
|
||||
});
|
||||
|
||||
export default releaseRollbackDialogStateInjectable;
|
||||
+8
-5
@@ -6,16 +6,19 @@ import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { getRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import { asyncComputed } from "@ogre-tools/injectable-react";
|
||||
import releaseInjectable from "./release.injectable";
|
||||
import { waitUntilDefined } from "../../../utils";
|
||||
|
||||
const releaseDetailsInjectable = getInjectable({
|
||||
id: "release-details",
|
||||
|
||||
instantiate: (di) =>
|
||||
asyncComputed(async () => {
|
||||
const release = di.inject(releaseInjectable).get();
|
||||
instantiate: (di) => {
|
||||
const releaseComputed = di.inject(releaseInjectable);
|
||||
|
||||
return await getRelease(release.name, release.namespace);
|
||||
}),
|
||||
return asyncComputed(async () => {
|
||||
const release = await waitUntilDefined(releaseComputed);
|
||||
|
||||
return getRelease(release.name, release.namespace);
|
||||
});},
|
||||
});
|
||||
|
||||
export default releaseDetailsInjectable;
|
||||
@@ -11,7 +11,7 @@ import type { IComputedValue } from "mobx";
|
||||
import { computed, makeObservable, observable } from "mobx";
|
||||
import { Link } from "react-router-dom";
|
||||
import kebabCase from "lodash/kebabCase";
|
||||
import type { HelmRelease, IReleaseDetails, IReleaseUpdateDetails, IReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import type { HelmRelease, HelmReleaseDetails, HelmReleaseUpdateDetails, HelmReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import { HelmReleaseMenu } from "../release-menu";
|
||||
import { Drawer, DrawerItem, DrawerTitle } from "../../drawer";
|
||||
import { Badge } from "../../badge";
|
||||
@@ -21,10 +21,9 @@ import { Spinner } from "../../spinner";
|
||||
import { Table, TableCell, TableHead, TableRow } from "../../table";
|
||||
import { Button } from "../../button";
|
||||
import { Notifications } from "../../notifications";
|
||||
import { ThemeStore } from "../../../theme.store";
|
||||
import { apiManager } from "../../../../common/k8s-api/api-manager";
|
||||
import type { ThemeStore } from "../../../themes/store";
|
||||
import type { ApiManager } from "../../../../common/k8s-api/api-manager";
|
||||
import { SubTitle } from "../../layout/sub-title";
|
||||
import { getDetailsUrl } from "../../kube-detail-params";
|
||||
import { Checkbox } from "../../checkbox";
|
||||
import { MonacoEditor } from "../../monaco-editor";
|
||||
import type { IAsyncComputed } from "@ogre-tools/injectable-react";
|
||||
@@ -35,48 +34,52 @@ import releaseInjectable from "./release.injectable";
|
||||
import releaseDetailsInjectable from "./release-details.injectable";
|
||||
import releaseValuesInjectable from "./release-values.injectable";
|
||||
import userSuppliedValuesAreShownInjectable from "./user-supplied-values-are-shown.injectable";
|
||||
import type { KubeObject } from "../../../../common/k8s-api/kube-object";
|
||||
import { KubeObjectAge } from "../../kube-object/age";
|
||||
import type { KubeJsonApiData } from "../../../../common/k8s-api/kube-json-api";
|
||||
import { entries } from "../../../../common/utils/objects";
|
||||
import themeStoreInjectable from "../../../themes/store.injectable";
|
||||
import type { GetDetailsUrl } from "../../kube-detail-params/get-details-url.injectable";
|
||||
import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable";
|
||||
import getDetailsUrlInjectable from "../../kube-detail-params/get-details-url.injectable";
|
||||
|
||||
export interface ReleaseDetailsProps {
|
||||
hideDetails(): void;
|
||||
}
|
||||
|
||||
interface Dependencies {
|
||||
release: IComputedValue<HelmRelease>;
|
||||
releaseDetails: IAsyncComputed<IReleaseDetails>;
|
||||
release: IComputedValue<HelmRelease | null | undefined>;
|
||||
releaseDetails: IAsyncComputed<HelmReleaseDetails>;
|
||||
releaseValues: IAsyncComputed<string>;
|
||||
updateRelease: (name: string, namespace: string, payload: IReleaseUpdatePayload) => Promise<IReleaseUpdateDetails>;
|
||||
updateRelease: (name: string, namespace: string, payload: HelmReleaseUpdatePayload) => Promise<HelmReleaseUpdateDetails>;
|
||||
createUpgradeChartTab: (release: HelmRelease) => void;
|
||||
userSuppliedValuesAreShown: { toggle: () => void; value: boolean };
|
||||
themeStore: ThemeStore;
|
||||
apiManager: ApiManager;
|
||||
getDetailsUrl: GetDetailsUrl;
|
||||
}
|
||||
|
||||
@observer
|
||||
class NonInjectedReleaseDetails extends Component<ReleaseDetailsProps & Dependencies> {
|
||||
@observable saving = false;
|
||||
|
||||
private nonSavedValues: string;
|
||||
private nonSavedValues = "";
|
||||
|
||||
constructor(props: ReleaseDetailsProps & Dependencies) {
|
||||
super(props);
|
||||
makeObservable(this);
|
||||
}
|
||||
|
||||
@computed get release() {
|
||||
return this.props.release.get();
|
||||
}
|
||||
|
||||
@computed get details() {
|
||||
return this.props.releaseDetails.value.get();
|
||||
}
|
||||
|
||||
updateValues = async () => {
|
||||
const name = this.release.getName();
|
||||
const namespace = this.release.getNs();
|
||||
updateValues = async (release: HelmRelease) => {
|
||||
const name = release.getName();
|
||||
const namespace = release.getNs();
|
||||
const data = {
|
||||
chart: this.release.getChart(),
|
||||
repo: await this.release.getRepo(),
|
||||
version: this.release.getVersion(),
|
||||
chart: release.getChart(),
|
||||
repo: await release.getRepo(),
|
||||
version: release.getVersion(),
|
||||
values: this.nonSavedValues,
|
||||
};
|
||||
|
||||
@@ -85,24 +88,28 @@ class NonInjectedReleaseDetails extends Component<ReleaseDetailsProps & Dependen
|
||||
try {
|
||||
await this.props.updateRelease(name, namespace, data);
|
||||
Notifications.ok(
|
||||
<p>Release <b>{name}</b> successfully updated!</p>,
|
||||
<p>
|
||||
Release
|
||||
<b>{name}</b>
|
||||
{" successfully updated!"}
|
||||
</p>,
|
||||
);
|
||||
|
||||
this.props.releaseValues.invalidate();
|
||||
} catch (err) {
|
||||
Notifications.error(err);
|
||||
Notifications.checkedError(err, "Unknown error occured while updating release");
|
||||
}
|
||||
this.saving = false;
|
||||
};
|
||||
|
||||
upgradeVersion = () => {
|
||||
const { hideDetails } = this.props;
|
||||
upgradeVersion = (release: HelmRelease) => {
|
||||
const { hideDetails, createUpgradeChartTab } = this.props;
|
||||
|
||||
this.props.createUpgradeChartTab(this.release);
|
||||
createUpgradeChartTab(release);
|
||||
hideDetails();
|
||||
};
|
||||
|
||||
renderValues() {
|
||||
renderValues(release: HelmRelease) {
|
||||
return (
|
||||
<Observer>
|
||||
{() => {
|
||||
@@ -133,7 +140,7 @@ class NonInjectedReleaseDetails extends Component<ReleaseDetailsProps & Dependen
|
||||
label="Save"
|
||||
waiting={saving}
|
||||
disabled={releaseValuesArePending}
|
||||
onClick={this.updateValues}
|
||||
onClick={() => this.updateValues(release)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -154,28 +161,29 @@ class NonInjectedReleaseDetails extends Component<ReleaseDetailsProps & Dependen
|
||||
);
|
||||
}
|
||||
|
||||
renderResources(resources: KubeObject[]) {
|
||||
renderResources(resources: KubeJsonApiData[]) {
|
||||
const { apiManager, getDetailsUrl } = this.props;
|
||||
|
||||
return (
|
||||
<div className="resources">
|
||||
{
|
||||
Object.entries(groupBy(resources, item => item.kind))
|
||||
entries(groupBy(resources, item => item.kind))
|
||||
.map(([kind, items]) => (
|
||||
<React.Fragment key={kind}>
|
||||
<SubTitle title={kind} />
|
||||
<Table scrollable={false}>
|
||||
<TableHead sticky={false}>
|
||||
<TableCell className="name">Name</TableCell>
|
||||
{items[0].getNs() && <TableCell className="namespace">Namespace</TableCell>}
|
||||
{items[0].metadata.namespace && <TableCell className="namespace">Namespace</TableCell>}
|
||||
<TableCell className="age">Age</TableCell>
|
||||
</TableHead>
|
||||
{items.map(item => {
|
||||
const name = item.getName();
|
||||
const namespace = item.getNs();
|
||||
const { name, namespace, uid } = item.metadata;
|
||||
const api = apiManager.getApi(api => api.kind === kind && api.apiVersionWithGroup == item.apiVersion);
|
||||
const detailsUrl = api ? getDetailsUrl(api.getUrl({ name, namespace })) : "";
|
||||
|
||||
return (
|
||||
<TableRow key={item.getId()}>
|
||||
<TableRow key={uid}>
|
||||
<TableCell className="name">
|
||||
{detailsUrl ? <Link to={detailsUrl}>{name}</Link> : name}
|
||||
</TableCell>
|
||||
@@ -198,9 +206,7 @@ class NonInjectedReleaseDetails extends Component<ReleaseDetailsProps & Dependen
|
||||
);
|
||||
}
|
||||
|
||||
renderContent() {
|
||||
if (!this.release) return null;
|
||||
|
||||
renderContent(release: HelmRelease) {
|
||||
if (!this.details) {
|
||||
return <Spinner center/>;
|
||||
}
|
||||
@@ -211,35 +217,40 @@ class NonInjectedReleaseDetails extends Component<ReleaseDetailsProps & Dependen
|
||||
<div>
|
||||
<DrawerItem name="Chart" className="chart">
|
||||
<div className="flex gaps align-center">
|
||||
<span>{this.release.getChart()}</span>
|
||||
<span>{release.getChart()}</span>
|
||||
<Button
|
||||
primary
|
||||
label="Upgrade"
|
||||
className="box right upgrade"
|
||||
onClick={this.upgradeVersion}
|
||||
onClick={() => this.upgradeVersion(release)}
|
||||
/>
|
||||
</div>
|
||||
</DrawerItem>
|
||||
<DrawerItem name="Updated">
|
||||
{this.release.getUpdated()} ago ({this.release.updated})
|
||||
{release.getUpdated()}
|
||||
{` ago (${release.updated})`}
|
||||
</DrawerItem>
|
||||
<DrawerItem name="Namespace">
|
||||
{this.release.getNs()}
|
||||
{release.getNs()}
|
||||
</DrawerItem>
|
||||
<DrawerItem name="Version" onClick={stopPropagation}>
|
||||
<div className="version flex gaps align-center">
|
||||
<span>
|
||||
{this.release.getVersion()}
|
||||
{release.getVersion()}
|
||||
</span>
|
||||
</div>
|
||||
</DrawerItem>
|
||||
<DrawerItem name="Status" className="status" labelsOnly>
|
||||
<DrawerItem
|
||||
name="Status"
|
||||
className="status"
|
||||
labelsOnly
|
||||
>
|
||||
<Badge
|
||||
label={this.release.getStatus()}
|
||||
className={kebabCase(this.release.getStatus())}
|
||||
label={release.getStatus()}
|
||||
className={kebabCase(release.getStatus())}
|
||||
/>
|
||||
</DrawerItem>
|
||||
{this.renderValues()}
|
||||
{this.renderValues(release)}
|
||||
<DrawerTitle>Notes</DrawerTitle>
|
||||
{this.renderNotes()}
|
||||
<DrawerTitle>Resources</DrawerTitle>
|
||||
@@ -249,39 +260,41 @@ class NonInjectedReleaseDetails extends Component<ReleaseDetailsProps & Dependen
|
||||
}
|
||||
|
||||
render() {
|
||||
const { hideDetails } = this.props;
|
||||
const title = this.release ? `Release: ${this.release.getName()}` : "";
|
||||
const toolbar = <HelmReleaseMenu release={this.release} toolbar hideDetails={hideDetails}/>;
|
||||
const { hideDetails, themeStore } = this.props;
|
||||
const release = this.props.release.get();
|
||||
|
||||
return (
|
||||
<Drawer
|
||||
className={cssNames("ReleaseDetails", ThemeStore.getInstance().activeTheme.type)}
|
||||
className={cssNames("ReleaseDetails", themeStore.activeTheme.type)}
|
||||
usePortal={true}
|
||||
open={!!this.release}
|
||||
title={title}
|
||||
open={Boolean(release)}
|
||||
title={release ? `Release: ${release.getName()}` : ""}
|
||||
onClose={hideDetails}
|
||||
toolbar={toolbar}
|
||||
toolbar={release && (
|
||||
<HelmReleaseMenu
|
||||
release={release}
|
||||
toolbar
|
||||
hideDetails={hideDetails}
|
||||
/>
|
||||
)}
|
||||
>
|
||||
{this.renderContent()}
|
||||
{release && this.renderContent(release)}
|
||||
</Drawer>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export const ReleaseDetails = withInjectables<Dependencies, ReleaseDetailsProps>(
|
||||
NonInjectedReleaseDetails,
|
||||
|
||||
{
|
||||
getProps: (di, props) => ({
|
||||
release: di.inject(releaseInjectable),
|
||||
releaseDetails: di.inject(releaseDetailsInjectable),
|
||||
releaseValues: di.inject(releaseValuesInjectable),
|
||||
|
||||
userSuppliedValuesAreShown: di.inject(userSuppliedValuesAreShownInjectable),
|
||||
|
||||
updateRelease: di.inject(updateReleaseInjectable),
|
||||
createUpgradeChartTab: di.inject(createUpgradeChartTabInjectable),
|
||||
...props,
|
||||
}),
|
||||
},
|
||||
);
|
||||
export const ReleaseDetails = withInjectables<Dependencies, ReleaseDetailsProps>(NonInjectedReleaseDetails, {
|
||||
getProps: (di, props) => ({
|
||||
...props,
|
||||
release: di.inject(releaseInjectable),
|
||||
releaseDetails: di.inject(releaseDetailsInjectable),
|
||||
releaseValues: di.inject(releaseValuesInjectable),
|
||||
userSuppliedValuesAreShown: di.inject(userSuppliedValuesAreShownInjectable),
|
||||
updateRelease: di.inject(updateReleaseInjectable),
|
||||
createUpgradeChartTab: di.inject(createUpgradeChartTabInjectable),
|
||||
themeStore: di.inject(themeStoreInjectable),
|
||||
apiManager: di.inject(apiManagerInjectable),
|
||||
getDetailsUrl: di.inject(getDetailsUrlInjectable),
|
||||
}),
|
||||
});
|
||||
@@ -12,8 +12,9 @@ import { MenuItem } from "../menu";
|
||||
import { Icon } from "../icon";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import createUpgradeChartTabInjectable from "../dock/upgrade-chart/create-upgrade-chart-tab.injectable";
|
||||
import releaseRollbackDialogModelInjectable from "./release-rollback-dialog-model/release-rollback-dialog-model.injectable";
|
||||
import deleteReleaseInjectable from "./delete-release/delete-release.injectable";
|
||||
import type { OpenHelmReleaseRollbackDialog } from "./dialog/open.injectable";
|
||||
import openHelmReleaseRollbackDialogInjectable from "./dialog/open.injectable";
|
||||
|
||||
export interface HelmReleaseMenuProps extends MenuActionsProps {
|
||||
release: HelmRelease;
|
||||
@@ -23,7 +24,7 @@ export interface HelmReleaseMenuProps extends MenuActionsProps {
|
||||
interface Dependencies {
|
||||
deleteRelease: (release: HelmRelease) => Promise<any>;
|
||||
createUpgradeChartTab: (release: HelmRelease) => void;
|
||||
openRollbackDialog: (release: HelmRelease) => void;
|
||||
openRollbackDialog: OpenHelmReleaseRollbackDialog;
|
||||
}
|
||||
|
||||
class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps & Dependencies> {
|
||||
@@ -52,12 +53,20 @@ class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps &
|
||||
<>
|
||||
{hasRollback && (
|
||||
<MenuItem onClick={this.rollback}>
|
||||
<Icon material="history" interactive={toolbar} tooltip="Rollback"/>
|
||||
<Icon
|
||||
material="history"
|
||||
interactive={toolbar}
|
||||
tooltip="Rollback"
|
||||
/>
|
||||
<span className="title">Rollback</span>
|
||||
</MenuItem>
|
||||
)}
|
||||
<MenuItem onClick={this.upgrade}>
|
||||
<Icon material="refresh" interactive={toolbar} tooltip="Upgrade"/>
|
||||
<Icon
|
||||
material="refresh"
|
||||
interactive={toolbar}
|
||||
tooltip="Upgrade"
|
||||
/>
|
||||
<span className="title">Upgrade</span>
|
||||
</MenuItem>
|
||||
</>
|
||||
@@ -72,7 +81,13 @@ class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps &
|
||||
{...menuProps}
|
||||
className={cssNames("HelmReleaseMenu", className)}
|
||||
removeAction={this.remove}
|
||||
removeConfirmationMessage={() => <p>Remove Helm Release <b>{release.name}</b>?</p>}
|
||||
removeConfirmationMessage={() => (
|
||||
<p>
|
||||
Remove Helm Release
|
||||
<b>{release.name}</b>
|
||||
?
|
||||
</p>
|
||||
)}
|
||||
>
|
||||
{this.renderContent()}
|
||||
</MenuActions>
|
||||
@@ -80,16 +95,11 @@ class NonInjectedHelmReleaseMenu extends React.Component<HelmReleaseMenuProps &
|
||||
}
|
||||
}
|
||||
|
||||
export const HelmReleaseMenu = withInjectables<Dependencies, HelmReleaseMenuProps>(
|
||||
NonInjectedHelmReleaseMenu,
|
||||
|
||||
{
|
||||
getProps: (di, props) => ({
|
||||
deleteRelease: di.inject(deleteReleaseInjectable),
|
||||
createUpgradeChartTab: di.inject(createUpgradeChartTabInjectable),
|
||||
openRollbackDialog: di.inject(releaseRollbackDialogModelInjectable).open,
|
||||
|
||||
...props,
|
||||
}),
|
||||
},
|
||||
);
|
||||
export const HelmReleaseMenu = withInjectables<Dependencies, HelmReleaseMenuProps>(NonInjectedHelmReleaseMenu, {
|
||||
getProps: (di, props) => ({
|
||||
...props,
|
||||
deleteRelease: di.inject(deleteReleaseInjectable),
|
||||
createUpgradeChartTab: di.inject(createUpgradeChartTabInjectable),
|
||||
openRollbackDialog: di.inject(openHelmReleaseRollbackDialogInjectable),
|
||||
}),
|
||||
});
|
||||
-13
@@ -1,13 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { ReleaseRollbackDialogModel } from "./release-rollback-dialog-model";
|
||||
|
||||
const releaseRollbackDialogModelInjectable = getInjectable({
|
||||
id: "release-rollback-dialog-model",
|
||||
instantiate: () => new ReleaseRollbackDialogModel(),
|
||||
});
|
||||
|
||||
export default releaseRollbackDialogModelInjectable;
|
||||
-31
@@ -1,31 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { computed, observable, makeObservable, action } from "mobx";
|
||||
import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
|
||||
export class ReleaseRollbackDialogModel {
|
||||
release: HelmRelease | null = null;
|
||||
|
||||
constructor() {
|
||||
makeObservable(this, {
|
||||
isOpen: computed,
|
||||
release: observable,
|
||||
open: action,
|
||||
close: action,
|
||||
});
|
||||
}
|
||||
|
||||
get isOpen() {
|
||||
return !!this.release;
|
||||
}
|
||||
|
||||
open = (release: HelmRelease) => {
|
||||
this.release = release;
|
||||
};
|
||||
|
||||
close = () => {
|
||||
this.release = null;
|
||||
};
|
||||
}
|
||||
@@ -1,131 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import "./release-rollback-dialog.scss";
|
||||
|
||||
import React from "react";
|
||||
import { observable, makeObservable } from "mobx";
|
||||
import { observer } from "mobx-react";
|
||||
import type { DialogProps } from "../dialog";
|
||||
import { Dialog } from "../dialog";
|
||||
import { Wizard, WizardStep } from "../wizard";
|
||||
import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import { getReleaseHistory, type IReleaseRevision } from "../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import type { SelectOption } from "../select";
|
||||
import { Select } from "../select";
|
||||
import { Notifications } from "../notifications";
|
||||
import orderBy from "lodash/orderBy";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import releaseRollbackDialogModelInjectable
|
||||
from "./release-rollback-dialog-model/release-rollback-dialog-model.injectable";
|
||||
import type { ReleaseRollbackDialogModel } from "./release-rollback-dialog-model/release-rollback-dialog-model";
|
||||
import rollbackReleaseInjectable from "./rollback-release/rollback-release.injectable";
|
||||
|
||||
export interface ReleaseRollbackDialogProps extends DialogProps {
|
||||
}
|
||||
|
||||
interface Dependencies {
|
||||
rollbackRelease: (releaseName: string, namespace: string, revisionNumber: number) => Promise<void>;
|
||||
model: ReleaseRollbackDialogModel;
|
||||
}
|
||||
|
||||
@observer
|
||||
class NonInjectedReleaseRollbackDialog extends React.Component<ReleaseRollbackDialogProps & Dependencies> {
|
||||
@observable isLoading = false;
|
||||
@observable revision: IReleaseRevision;
|
||||
@observable revisions = observable.array<IReleaseRevision>();
|
||||
|
||||
constructor(props: ReleaseRollbackDialogProps & Dependencies) {
|
||||
super(props);
|
||||
makeObservable(this);
|
||||
}
|
||||
|
||||
get release(): HelmRelease {
|
||||
return this.props.model.release;
|
||||
}
|
||||
|
||||
onOpen = async () => {
|
||||
this.isLoading = true;
|
||||
let releases = await getReleaseHistory(this.release.getName(), this.release.getNs());
|
||||
|
||||
releases = orderBy(releases, "revision", "desc"); // sort
|
||||
this.revisions.replace(releases);
|
||||
this.revision = this.revisions[0];
|
||||
this.isLoading = false;
|
||||
};
|
||||
|
||||
rollback = async () => {
|
||||
const revisionNumber = this.revision.revision;
|
||||
|
||||
try {
|
||||
await this.props.rollbackRelease(this.release.getName(), this.release.getNs(), revisionNumber);
|
||||
this.props.model.close();
|
||||
} catch (err) {
|
||||
Notifications.error(err);
|
||||
}
|
||||
};
|
||||
|
||||
renderContent() {
|
||||
const { revision, revisions } = this;
|
||||
|
||||
if (!revision) {
|
||||
return <p>No revisions to rollback.</p>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex gaps align-center">
|
||||
<b>Revision</b>
|
||||
<Select
|
||||
id="revision-input"
|
||||
themeName="light"
|
||||
value={revision}
|
||||
options={revisions}
|
||||
formatOptionLabel={({ value }: SelectOption<IReleaseRevision>) => `${value.revision} - ${value.chart}
|
||||
- ${value.app_version}, updated: ${new Date(value.updated).toLocaleString()}`}
|
||||
onChange={({ value }: SelectOption<IReleaseRevision>) => this.revision = value}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
render() {
|
||||
const { ...dialogProps } = this.props;
|
||||
const releaseName = this.release ? this.release.getName() : "";
|
||||
const header = <h5>Rollback <b>{releaseName}</b></h5>;
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
{...dialogProps}
|
||||
className="ReleaseRollbackDialog"
|
||||
isOpen={this.props.model.isOpen}
|
||||
onOpen={this.onOpen}
|
||||
close={this.props.model.close}
|
||||
>
|
||||
<Wizard header={header} done={this.props.model.close}>
|
||||
<WizardStep
|
||||
scrollable={false}
|
||||
nextLabel="Rollback"
|
||||
next={this.rollback}
|
||||
loading={this.isLoading}
|
||||
>
|
||||
{this.renderContent()}
|
||||
</WizardStep>
|
||||
</Wizard>
|
||||
</Dialog>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export const ReleaseRollbackDialog = withInjectables<Dependencies, ReleaseRollbackDialogProps>(
|
||||
NonInjectedReleaseRollbackDialog,
|
||||
|
||||
{
|
||||
getProps: (di, props) => ({
|
||||
rollbackRelease: di.inject(rollbackReleaseInjectable),
|
||||
model: di.inject(releaseRollbackDialogModelInjectable),
|
||||
...props,
|
||||
}),
|
||||
},
|
||||
);
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { asyncComputed } from "@ogre-tools/injectable-react";
|
||||
import namespaceStoreInjectable from "../+namespaces/namespace-store/namespace-store.injectable";
|
||||
import namespaceStoreInjectable from "../+namespaces/store.injectable";
|
||||
import { listReleases } from "../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
|
||||
const releasesInjectable = getInjectable({
|
||||
@@ -21,7 +21,7 @@ const releasesInjectable = getInjectable({
|
||||
|
||||
const isLoadingAll =
|
||||
clusterContext.allNamespaces?.length > 1 &&
|
||||
clusterContext.cluster.accessibleNamespaces.length === 0 &&
|
||||
clusterContext.cluster?.accessibleNamespaces.length === 0 &&
|
||||
clusterContext.allNamespaces.every((namespace) =>
|
||||
contextNamespaces.includes(namespace),
|
||||
);
|
||||
|
||||
@@ -9,13 +9,13 @@ import "./releases.scss";
|
||||
import React, { Component } from "react";
|
||||
import type { HelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import namespaceStoreInjectable from "../+namespaces/namespace-store/namespace-store.injectable";
|
||||
import namespaceStoreInjectable from "../+namespaces/store.injectable";
|
||||
import type { ItemListStore } from "../item-object-list";
|
||||
import { ItemListLayout } from "../item-object-list";
|
||||
import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter";
|
||||
import { kebabCase } from "lodash/fp";
|
||||
import { HelmReleaseMenu } from "./release-menu";
|
||||
import type { ItemStore } from "../../../common/item.store";
|
||||
import { ReleaseRollbackDialog } from "./release-rollback-dialog";
|
||||
import { ReleaseRollbackDialog } from "./dialog/dialog";
|
||||
import { ReleaseDetails } from "./release-details/release-details";
|
||||
import removableReleasesInjectable from "./removable-releases.injectable";
|
||||
import type { RemovableHelmRelease } from "./removable-releases";
|
||||
@@ -75,7 +75,11 @@ class NonInjectedHelmReleases extends Component<Dependencies> {
|
||||
|
||||
return (
|
||||
<div>
|
||||
<>Remove <b>{releaseNames}</b>?</>
|
||||
<>
|
||||
Remove
|
||||
<b>{releaseNames}</b>
|
||||
?
|
||||
</>
|
||||
<p className="warning">
|
||||
Note: StatefulSet Volumes won't be deleted automatically
|
||||
</p>
|
||||
@@ -88,13 +92,7 @@ class NonInjectedHelmReleases extends Component<Dependencies> {
|
||||
const releasesArePending = this.props.releasesArePending;
|
||||
|
||||
// TODO: Implement ItemListLayout without stateful stores
|
||||
const legacyReleaseStore = {
|
||||
get items() {
|
||||
return releases.get();
|
||||
},
|
||||
|
||||
loadAll: () => Promise.resolve(),
|
||||
|
||||
const legacyReleaseStore: ItemListStore<RemovableHelmRelease, false> = {
|
||||
get isLoaded() {
|
||||
return !releasesArePending.get();
|
||||
},
|
||||
@@ -103,49 +101,45 @@ class NonInjectedHelmReleases extends Component<Dependencies> {
|
||||
|
||||
getTotalCount: () => releases.get().length,
|
||||
|
||||
toggleSelection: (item) => {
|
||||
item.toggle();
|
||||
},
|
||||
toggleSelection: (release) => release.toggle(),
|
||||
|
||||
isSelectedAll: (visibleItems: RemovableHelmRelease[]) => (
|
||||
visibleItems.length > 0
|
||||
&& visibleItems.every((release) => release.isSelected)
|
||||
isSelectedAll: (releases) => (
|
||||
releases.length > 0
|
||||
&& releases.every((release) => release.isSelected)
|
||||
),
|
||||
|
||||
toggleSelectionAll: (visibleItems: RemovableHelmRelease[]) => {
|
||||
toggleSelectionAll: (releases) => {
|
||||
let selected = false;
|
||||
|
||||
if (!legacyReleaseStore.isSelectedAll(visibleItems)) {
|
||||
if (!legacyReleaseStore.isSelectedAll(releases)) {
|
||||
selected = true;
|
||||
}
|
||||
|
||||
visibleItems.forEach((release) => {
|
||||
for (const release of releases) {
|
||||
if (release.isSelected !== selected) {
|
||||
release.toggle();
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
isSelected: (item) => item.isSelected,
|
||||
isSelected: (release) => release.isSelected,
|
||||
|
||||
get selectedItems() {
|
||||
return releases.get().filter((release) => release.isSelected);
|
||||
removeSelectedItems: async () => {
|
||||
await Promise.all(
|
||||
releases.get()
|
||||
.filter((release) => release.isSelected)
|
||||
.map(release => release.delete()),
|
||||
);
|
||||
},
|
||||
|
||||
pickOnlySelected: (releases) => {
|
||||
return releases.filter(release => release.isSelected);
|
||||
},
|
||||
|
||||
removeItems: async (releases) => {
|
||||
await Promise.all(releases.map(release => release.delete()));
|
||||
},
|
||||
} as ItemStore<RemovableHelmRelease>;
|
||||
pickOnlySelected: (releases) => releases.filter(release => release.isSelected),
|
||||
};
|
||||
|
||||
return (
|
||||
<SiblingsInTabLayout>
|
||||
<ItemListLayout
|
||||
<ItemListLayout<RemovableHelmRelease, false>
|
||||
store={legacyReleaseStore}
|
||||
getItems={() => legacyReleaseStore.items}
|
||||
getItems={() => releases.get()}
|
||||
preloadStores={false}
|
||||
isConfigurable
|
||||
tableId="helm_releases"
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
|
||||
import type {
|
||||
IReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
HelmReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
import {
|
||||
updateRelease,
|
||||
} from "../../../../common/k8s-api/endpoints/helm-releases.api";
|
||||
@@ -19,7 +20,7 @@ const updateReleaseInjectable = getInjectable({
|
||||
return async (
|
||||
name: string,
|
||||
namespace: string,
|
||||
payload: IReleaseUpdatePayload,
|
||||
payload: HelmReleaseUpdatePayload,
|
||||
) => {
|
||||
const result = await updateRelease(name, namespace, payload);
|
||||
|
||||
|
||||
Reference in new issue
Block a user