hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix overview and review routes

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2022-02-09 15:48:25 +03:00
parent 43954e4fad
commit 20b8369f17
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/routes/preferences.ts
View File

@ -43,11 +43,11 @@ export const installRoute: RouteProps = {
}; };
export const extensionPageRoute: RouteProps = { export const extensionPageRoute: RouteProps = {
path: `${preferencesRoute.path}/extension/:extensionId?`, path: `${preferencesRoute.path}/extension/:extensionId?/overview`,
}; };
export const extensionReviewsRoute: RouteProps = { export const extensionReviewsRoute: RouteProps = {
path: `${extensionPageRoute.path}/reviews`, path: `${preferencesRoute.path}/extension/:extensionId?/reviews`,
}; };
export const preferencesURL = buildURL(preferencesRoute.path); export const preferencesURL = buildURL(preferencesRoute.path);

21
src/renderer/components/+preferences/extension-page.tsx
View File

@ -13,7 +13,7 @@ import { matchPath, Route, RouteProps, Switch, useParams } from "react-router";
import { MarkdownViewer } from "../markdown-viewer"; import { MarkdownViewer } from "../markdown-viewer";
import { Tab, Tabs } from "../tabs"; import { Tab, Tabs } from "../tabs";
import { navigate } from "../../navigation"; import { navigate } from "../../navigation";
import { extensionPageRoute, extensionPageURL, extensionReviewsRoute, extensionReviewsURL } from "../../../common/routes"; import { extensionPageRoute, extensionReviewsRoute } from "../../../common/routes";
export function ExtensionPage() { export function ExtensionPage() {
const [extension, setExtension] = useState<Extension>(null); const [extension, setExtension] = useState<Extension>(null);
@ -50,7 +50,7 @@ export function ExtensionPage() {
}, []); }, []);
if (!extension || !description) { if (!extension || !description) {
return <Spinner/>; return <Spinner center/>;
} }
return ( return (
@ -61,31 +61,26 @@ export function ExtensionPage() {
navigate(url); navigate(url);
}}> }}>
<Tab <Tab
value={`/preferences/extension/${extension.id}`} value={`/preferences/extension/${extension.id}/overview`}
label="Overview" label="Overview"
active={isActive(extensionPageRoute)} active={isActive(extensionPageRoute)}
/> />
<Tab <Tab
value={`${extension.id}/reviews`} value={`/preferences/extension/${extension.id}/reviews`}
label="Rating & Review" label="Rating & Review"
active={isActive(extensionReviewsRoute)} active={isActive(extensionReviewsRoute)}
/> />
{/* {tabs.map(({ title, routePath, url = routePath, exact }) => {
const isActive = !!matchPath(currentLocation, { path: routePath, exact });
return <Tab key={url} label={title} value={url} active={isActive}/>;
})} */}
</Tabs> </Tabs>
<div className={styles.contents}> <div className={styles.contents}>
<Switch> <Switch>
<Route path={extensionReviewsURL()}> <Route path={`/preferences/extension/:extensionId?/overview`}>
<Reviews reviews={reviews}/>
</Route>
<Route path={extensionPageURL()}>
<Overview extension={extension} description={description}/> <Overview extension={extension} description={description}/>
</Route> </Route>
<Route path={`/preferences/extension/:extensionId?/reviews`}>
<Reviews reviews={reviews}/>
</Route>
</Switch> </Switch>
</div> </div>
</section> </section>

2
src/renderer/components/+preferences/install.tsx
View File

@ -63,7 +63,7 @@ function ExtensionList({ extensions, search }: { extensions: Extension[], search
)); ));
function handleClick(extensionId: string) { function handleClick(extensionId: string) {
history.push(`extension/${extensionId}`); history.push(`extension/${extensionId}/overview`);
} }
if (!filteredExtensions.length) { if (!filteredExtensions.length) {

4
src/renderer/components/+preferences/preferences.tsx
View File

@ -26,7 +26,7 @@ import {
terminalURL, terminalURL,
installURL, installURL,
installRoute, installRoute,
extensionPageURL, // extensionPageURL,
} from "../../../common/routes"; } from "../../../common/routes";
import { navigateWithoutHistoryChange, navigation } from "../../navigation"; import { navigateWithoutHistoryChange, navigation } from "../../navigation";
import { SettingLayout } from "../layout/setting-layout"; import { SettingLayout } from "../layout/setting-layout";
@ -95,7 +95,7 @@ const NonInjectedPreferences: React.FC<Dependencies> = ({ appPreferenceItems })
<Route path={telemetryURL()} component={Telemetry}/> <Route path={telemetryURL()} component={Telemetry}/>
<Route path={extensionURL()} component={Extensions}/> <Route path={extensionURL()} component={Extensions}/>
<Route path={installURL()} component={Install}/> <Route path={installURL()} component={Install}/>
<Route path={extensionPageURL()} component={ExtensionPage}/> <Route path={`/preferences/extension`} component={ExtensionPage}/>
<Redirect exact from={`${preferencesURL()}/`} to={appURL()}/> <Redirect exact from={`${preferencesURL()}/`} to={appURL()}/>
</Switch> </Switch>
</SettingLayout> </SettingLayout>