> Pull Request Template > > Use this template to quickly create a well written pull request. Delete all quotes before creating the pull request. > ## Description > Add a TL;DR when description is extra long (helps content team) > > Please include a summary of the changes and which issue has been fixed. Please also include relevant motivation > and context. List any dependencies that are required for this change > > Links to Notion, Figma or any other documents that might be relevant to the PR > > #### PR fixes following issue(s) Fixes # (issue number) > if no issue exists, please create an issue and ask the maintainers about this first > > #### Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video > > #### Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [ ] Manual - [ ] JUnit - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Added new workspace search functionality in the search bar. - Introduced a help button for user assistance. - Implemented new UI components for workspace selection and management. - Enhanced application card with edit permission checks. - Integrated workspace actions for creating and fetching workspaces directly from the UI. - **Improvements** - Improved workspace and application fetching logic. - Enhanced Global Search with updated import paths and logic. - Refined the layout and styling of the applications page and sub-header components. - Optimized workspace-related sagas and reducers for better performance and maintainability. - **Bug Fixes** - Fixed tooltip functionality in "Reconnect Datasources" within templates. - Corrected test logic for forking templates and applications. - Updated Cypress test commands for consistency and reliability. - Addressed issues with application URL test cases and workspace import logic. - **Documentation** - Updated messages and constants related to workspace and application UI elements for clearer user communication. - **Chores** - Cleaned up unused code and simplified selectors across various components and tests. - Refactored application and workspace selectors for improved code organization. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Dipyaman Biswas <dipyaman@appsmith.com> Co-authored-by: Abhijeet <abhi.nagarnaik@gmail.com> Co-authored-by: Nidhi <nidhi@appsmith.com> Co-authored-by: Goutham Pratapa <goutham@appsmith.com> Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Rishabh Rathod <rishabh.rathod@appsmith.com>
208 lines
6.1 KiB
TypeScript
208 lines
6.1 KiB
TypeScript
import React, { useState, useEffect, useRef } from "react";
|
|
import type {
|
|
ApplicationPayload,
|
|
Page,
|
|
} from "@appsmith/constants/ReduxActionConstants";
|
|
import { getAppMode } from "@appsmith/selectors/applicationSelectors";
|
|
import { useSelector } from "react-redux";
|
|
import classNames from "classnames";
|
|
import PrimaryCTA from "./PrimaryCTA";
|
|
import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
|
|
import { getSelectedAppTheme } from "selectors/appThemingSelectors";
|
|
import BrandingBadge from "./BrandingBadgeMobile";
|
|
import { getAppViewHeaderHeight } from "selectors/appViewSelectors";
|
|
import { useOnClickOutside } from "utils/hooks/useOnClickOutside";
|
|
import { useHref } from "pages/Editor/utils";
|
|
import { APP_MODE } from "entities/App";
|
|
import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
|
|
import { trimQueryString } from "utils/helpers";
|
|
import type { NavigationSetting } from "constants/AppConstants";
|
|
import { NAVIGATION_SETTINGS } from "constants/AppConstants";
|
|
import { get } from "lodash";
|
|
import { PageMenuContainer, StyledNavLink } from "./PageMenu.styled";
|
|
import { StyledCtaContainer } from "./Navigation/Sidebar.styled";
|
|
import ShareButton from "./Navigation/components/ShareButton";
|
|
import BackToAppsButton from "./Navigation/components/BackToAppsButton";
|
|
import { getHideWatermark } from "@appsmith/selectors/tenantSelectors";
|
|
|
|
interface NavigationProps {
|
|
isOpen?: boolean;
|
|
application?: ApplicationPayload;
|
|
pages: Page[];
|
|
url?: string;
|
|
setMenuOpen?: (shouldOpen: boolean) => void;
|
|
headerRef?: React.RefObject<HTMLDivElement>;
|
|
}
|
|
|
|
export function PageMenu(props: NavigationProps) {
|
|
const { application, headerRef, isOpen, pages, setMenuOpen } = props;
|
|
const menuRef = useRef<any>();
|
|
const selectedTheme = useSelector(getSelectedAppTheme);
|
|
const workspaceID = useSelector(getCurrentWorkspaceId);
|
|
const headerHeight = useSelector(getAppViewHeaderHeight);
|
|
const [query, setQuery] = useState("");
|
|
const hideWatermark = useSelector(getHideWatermark);
|
|
const navColorStyle =
|
|
application?.applicationDetail?.navigationSetting?.colorStyle ||
|
|
NAVIGATION_SETTINGS.COLOR_STYLE.LIGHT;
|
|
const primaryColor = get(
|
|
selectedTheme,
|
|
"properties.colors.primaryColor",
|
|
"inherit",
|
|
);
|
|
|
|
const closeMenu = () => {
|
|
if (typeof setMenuOpen === "function") {
|
|
setMenuOpen?.(false);
|
|
}
|
|
};
|
|
|
|
// hide menu on click outside
|
|
useOnClickOutside(
|
|
[menuRef, headerRef as React.RefObject<HTMLDivElement>],
|
|
() => {
|
|
closeMenu();
|
|
},
|
|
);
|
|
|
|
useEffect(() => {
|
|
setQuery(window.location.search);
|
|
}, [location.search]);
|
|
|
|
// Mark default page as first page
|
|
const appPages = pages;
|
|
if (appPages.length > 1) {
|
|
appPages.forEach((item, i) => {
|
|
if (item.isDefault) {
|
|
appPages.splice(i, 1);
|
|
appPages.unshift(item);
|
|
}
|
|
});
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{/* BG OVERLAY */}
|
|
<div
|
|
className={classNames({
|
|
"fixed h-full w-full bg-black/30 transform transition-all": true,
|
|
"opacity-0 hidden": !isOpen,
|
|
"opacity-100": isOpen,
|
|
})}
|
|
onClick={closeMenu}
|
|
style={{
|
|
height: `calc(100% - ${headerHeight})`,
|
|
}}
|
|
/>
|
|
{/* MAIN CONTAINER */}
|
|
<PageMenuContainer
|
|
className={classNames({
|
|
"fixed flex flex-col w-7/12 transform transition-all duration-400":
|
|
true,
|
|
"-left-full": !isOpen,
|
|
"left-0": isOpen,
|
|
})}
|
|
navColorStyle={navColorStyle}
|
|
primaryColor={primaryColor}
|
|
ref={menuRef}
|
|
style={{
|
|
height: `calc(100% - ${headerHeight}px)`,
|
|
}}
|
|
>
|
|
<div className="flex-grow py-3 overflow-y-auto page-list-container">
|
|
{appPages.map((page) => (
|
|
<PageNavLink
|
|
closeMenu={closeMenu}
|
|
key={page.pageId}
|
|
navColorStyle={navColorStyle}
|
|
page={page}
|
|
primaryColor={primaryColor}
|
|
query={query}
|
|
/>
|
|
))}
|
|
</div>
|
|
<div className="py-3 border-t">
|
|
{application && (
|
|
<StyledCtaContainer>
|
|
<ShareButton
|
|
currentApplicationDetails={application}
|
|
currentWorkspaceId={workspaceID}
|
|
insideSidebar
|
|
/>
|
|
|
|
{isOpen && (
|
|
<PrimaryCTA
|
|
className="t--back-to-editor--mobile"
|
|
insideSidebar
|
|
navColorStyle={navColorStyle}
|
|
primaryColor={primaryColor}
|
|
url={props.url}
|
|
/>
|
|
)}
|
|
|
|
<BackToAppsButton
|
|
currentApplicationDetails={application}
|
|
insideSidebar
|
|
/>
|
|
|
|
{!hideWatermark && (
|
|
<a
|
|
className="flex mt-2 hover:no-underline"
|
|
href="https://appsmith.com"
|
|
rel="noreferrer"
|
|
target="_blank"
|
|
>
|
|
<BrandingBadge />
|
|
</a>
|
|
)}
|
|
</StyledCtaContainer>
|
|
)}
|
|
</div>
|
|
</PageMenuContainer>
|
|
</>
|
|
);
|
|
}
|
|
|
|
function PageNavLink({
|
|
closeMenu,
|
|
navColorStyle,
|
|
page,
|
|
primaryColor,
|
|
query,
|
|
}: {
|
|
page: Page;
|
|
query: string;
|
|
closeMenu: () => void;
|
|
primaryColor: string;
|
|
navColorStyle: NavigationSetting["colorStyle"];
|
|
}) {
|
|
const appMode = useSelector(getAppMode);
|
|
const selectedTheme = useSelector(getSelectedAppTheme);
|
|
const pathname = useHref(
|
|
appMode === APP_MODE.PUBLISHED ? viewerURL : builderURL,
|
|
{ pageId: page.pageId },
|
|
);
|
|
|
|
return (
|
|
<StyledNavLink
|
|
activeClassName="border-r-3 font-semibold"
|
|
activeStyle={{
|
|
borderColor: selectedTheme.properties.colors.primaryColor,
|
|
}}
|
|
className="flex flex-col px-4 py-2 no-underline border-transparent border-r-3 hover:no-underline"
|
|
key={page.pageId}
|
|
navColorStyle={navColorStyle}
|
|
onClick={closeMenu}
|
|
primaryColor={primaryColor}
|
|
to={{
|
|
pathname: trimQueryString(pathname),
|
|
search: query,
|
|
}}
|
|
>
|
|
{page.pageName}
|
|
</StyledNavLink>
|
|
);
|
|
}
|
|
|
|
export default PageMenu;
|