mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Topbar history buttons (#3696)
* HistoryStore initial draft Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Adding history icons Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Jump history using electron methods Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Using 1 topbar component for all views Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Add Catalog title to sidebar Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Show cluster name in sidebar Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Updating topbar tests Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Fixing Welcome tests Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Removing padding for external topbar items Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Fix cluster name prop Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com> * Using material icons for history buttons Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev authored and 
GitHub committed
1 parent
9d6bed8786
commit
7981e79cbd
16 files changed
+163
-132
No files matched your search
@@ -1,41 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2021 OpenLens Authors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import React from "react";
|
||||
import { welcomeURL } from "../../../common/routes";
|
||||
import { navigate } from "../../navigation";
|
||||
import { Icon } from "../icon";
|
||||
import { TopBar } from "../layout/topbar";
|
||||
|
||||
export function CatalogTopbar() {
|
||||
return (
|
||||
<TopBar label="Catalog">
|
||||
<div>
|
||||
<Icon
|
||||
style={{ cursor: "default" }}
|
||||
material="close"
|
||||
onClick={() => navigate(welcomeURL())}
|
||||
tooltip="Close Catalog"
|
||||
/>
|
||||
</div>
|
||||
</TopBar>
|
||||
);
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2021 OpenLens Authors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
import { observer } from "mobx-react";
|
||||
import React from "react";
|
||||
|
||||
import { previousActiveTab } from "../+catalog";
|
||||
import { ClusterStore } from "../../../common/cluster-store";
|
||||
import { catalogURL } from "../../../common/routes";
|
||||
import { navigate } from "../../navigation";
|
||||
import { Icon } from "../icon";
|
||||
import { TopBar } from "../layout/topbar";
|
||||
|
||||
import type { RouteComponentProps } from "react-router";
|
||||
import type { ClusterViewRouteParams } from "../../../common/routes";
|
||||
import type { Cluster } from "../../../main/cluster";
|
||||
import { TooltipPosition } from "../tooltip";
|
||||
|
||||
interface Props extends RouteComponentProps<ClusterViewRouteParams> {
|
||||
}
|
||||
|
||||
export const ClusterTopbar = observer((props: Props) => {
|
||||
const getCluster = (): Cluster | undefined => {
|
||||
return ClusterStore.getInstance().getById(props.match.params.clusterId);
|
||||
};
|
||||
|
||||
return (
|
||||
<TopBar label={getCluster()?.name}>
|
||||
<div>
|
||||
<Icon
|
||||
style={{ cursor: "default" }}
|
||||
material="close"
|
||||
onClick={() => {
|
||||
navigate(`${catalogURL()}/${previousActiveTab.get()}`);
|
||||
}}
|
||||
tooltip={{
|
||||
preferredPositions: TooltipPosition.BOTTOM_RIGHT,
|
||||
children: "Back to Catalog"
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</TopBar>
|
||||
);
|
||||
});
|
||||
@@ -34,7 +34,7 @@ import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
|
||||
import { navigate } from "../../navigation";
|
||||
import { catalogURL, ClusterViewRouteParams } from "../../../common/routes";
|
||||
import { previousActiveTab } from "../+catalog";
|
||||
import { ClusterTopbar } from "./cluster-topbar";
|
||||
import { TopBar } from "../layout/topbar";
|
||||
|
||||
interface Props extends RouteComponentProps<ClusterViewRouteParams> {
|
||||
}
|
||||
@@ -105,7 +105,7 @@ export class ClusterView extends React.Component<Props> {
|
||||
render() {
|
||||
return (
|
||||
<div className="ClusterView flex column align-center">
|
||||
<ClusterTopbar {...this.props}/>
|
||||
<TopBar/>
|
||||
{this.renderStatus()}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2021 OpenLens Authors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import React from "react";
|
||||
import { TopBar } from "../layout/topbar";
|
||||
|
||||
export function WelcomeTopbar() {
|
||||
return (
|
||||
<TopBar label="Welcome">
|
||||
</TopBar>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user