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

Adding more control over extension preferences page title (#5901)

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2022-07-27 14:05:55 +03:00 committed by GitHub
parent 392d548bf0
commit e334a6aeda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
View File

@ -172,10 +172,10 @@ exports[`preferences - navigation to extension specific preferences given in pre
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
data-testid="extension-preferences-page-title"
>
Metrics tab Metrics tab
preferences
</h2> </h2>
<section <section
class="small" class="small"
@ -472,10 +472,10 @@ exports[`preferences - navigation to extension specific preferences given in pre
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
data-testid="extension-preferences-page-title"
>
Metrics tab Metrics tab
preferences
</h2> </h2>
<section <section
class="small" class="small"
@ -772,10 +772,10 @@ exports[`preferences - navigation to extension specific preferences given in pre
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
data-testid="extension-preferences-page-title"
>
Metrics tab Metrics tab
preferences
</h2> </h2>
<section <section
class="small" class="small"
@ -1095,10 +1095,10 @@ exports[`preferences - navigation to extension specific preferences given in pre
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
some-test-extension-id data-testid="extension-preferences-page-title"
>
preferences some-test-extension-id preferences
</h2> </h2>
<section <section
class="small" class="small"
@ -2717,10 +2717,10 @@ exports[`preferences - navigation to extension specific preferences given in pre
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
some-test-extension-id data-testid="extension-preferences-page-title"
>
preferences some-test-extension-id preferences
</h2> </h2>
<section <section
class="small" class="small"
@ -2994,9 +2994,10 @@ exports[`preferences - navigation to extension specific preferences given in pre
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
data-testid="extension-preferences-page-title"
preferences >
Extension preferences
</h2> </h2>
<div <div
class="flex items-center" class="flex items-center"
@ -3263,10 +3264,10 @@ exports[`preferences - navigation to extension specific preferences when navigat
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
data-testid="extension-preferences-page-title"
>
Metrics tab Metrics tab
preferences
</h2> </h2>
<section <section
class="small" class="small"
@ -3551,10 +3552,10 @@ exports[`preferences - navigation to extension specific preferences when navigat
<section <section
id="extensions" id="extensions"
> >
<h2> <h2
extension-using-someone-else-tab-id data-testid="extension-preferences-page-title"
>
preferences extension-using-someone-else-tab-id preferences
</h2> </h2>
<section <section
class="small" class="small"

12
src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx
View File

@ -225,6 +225,18 @@ describe("preferences - navigation to extension specific preferences", () => {
expect(actual).not.toBeInTheDocument(); expect(actual).not.toBeInTheDocument();
}); });
it("shows page title", () => {
const pageTitle = rendered.queryByTestId("extension-preferences-page-title");
expect(pageTitle).toBeInTheDocument();
});
it("shows page title same as tab title", () => {
const pageTitle = rendered.queryByTestId("extension-preferences-page-title");
const tabs = extensionStubWithWithRegisteredTab.appPreferenceTabs;
const tabTitle = tabs && tabs[0].title;
expect(pageTitle?.innerHTML).toBe(tabTitle);
});
}); });
}); });

4
src/renderer/components/+preferences/extension-preference-model.injectable.ts
View File

@ -21,10 +21,12 @@ const extensionPreferencesModelInjectable = getInjectable({
const { extensionId, tabId } = pathParameters.get(); const { extensionId, tabId } = pathParameters.get();
const targetExtension = extensions.get().find((extension) => extension.sanitizedExtensionId === extensionId); const targetExtension = extensions.get().find((extension) => extension.sanitizedExtensionId === extensionId);
const targetAppTab = targetExtension?.appPreferenceTabs.find(tab => tab.id === tabId); const targetAppTab = targetExtension?.appPreferenceTabs.find(tab => tab.id === tabId);
const preferencePageTitle = targetAppTab?.title || `${targetExtension?.manifest.name || "Extension"} preferences`;
return { return {
extensionName: targetAppTab?.title ?? targetExtension?.manifest.name, extensionName: targetExtension?.manifest.name,
preferenceItems: getExtensionPreferenceItems(targetExtension, tabId), preferenceItems: getExtensionPreferenceItems(targetExtension, tabId),
preferencePageTitle,
}; };
}); });
}, },

9
src/renderer/components/+preferences/extensions.tsx
View File

@ -16,19 +16,18 @@ interface Dependencies {
model: IComputedValue<{ model: IComputedValue<{
preferenceItems: RegisteredAppPreference[]; preferenceItems: RegisteredAppPreference[];
extensionName?: string; extensionName?: string;
preferencePageTitle?: string;
}>; }>;
} }
const NonInjectedExtensions = ({ model }: Dependencies) => { const NonInjectedExtensions = ({ model }: Dependencies) => {
const { extensionName, preferenceItems } = model.get(); const { extensionName, preferenceItems, preferencePageTitle } = model.get();
return ( return (
<Preferences data-testid="extension-preferences-page"> <Preferences data-testid="extension-preferences-page">
<section id="extensions"> <section id="extensions">
<h2> <h2 data-testid="extension-preferences-page-title">
{extensionName} {preferencePageTitle}
{" "}
preferences
</h2> </h2>
{!extensionName && ( {!extensionName && (
<div <div