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

Clean up

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2022-06-08 10:55:11 +03:00
parent 5cb9b69e1b
commit df113e6178
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ describe("preferences - navigation to extension specific preferences", () => {
}); });
}); });
describe("given multiple extensions with and without specific preferences, when navigating to extension specific preferences page", () => { describe("given multiple extensions with and without specific preferences", () => {
beforeEach(async () => { beforeEach(async () => {
const getRendererExtensionFake = getRendererExtensionFakeFor(applicationBuilder); const getRendererExtensionFake = getRendererExtensionFakeFor(applicationBuilder);
const someTestExtension = getRendererExtensionFake(extensionStubWithExtensionSpecificPreferenceItems); const someTestExtension = getRendererExtensionFake(extensionStubWithExtensionSpecificPreferenceItems);
@ -112,7 +112,7 @@ describe("preferences - navigation to extension specific preferences", () => {
expect(actual).not.toBeNull(); expect(actual).not.toBeNull();
}); });
it("link doesn't have 'active' class", () => { it("link should not be active", () => {
const actual = rendered.getByTestId("tab-link-for-extension-some-test-extension-id"); const actual = rendered.getByTestId("tab-link-for-extension-some-test-extension-id");
expect(actual).not.toHaveClass("active"); expect(actual).not.toHaveClass("active");
@ -145,7 +145,7 @@ describe("preferences - navigation to extension specific preferences", () => {
expect(actual).toBeNull(); expect(actual).toBeNull();
}); });
it("link does have 'active' class", () => { it("link is active", () => {
const actual = rendered.getByTestId("tab-link-for-extension-some-test-extension-id"); const actual = rendered.getByTestId("tab-link-for-extension-some-test-extension-id");
expect(actual).toHaveClass("active"); expect(actual).toHaveClass("active");

7
src/renderer/components/+preferences/preferences-navigation/extensions-preferences-navigation-item.injectable.ts
View File

@ -16,7 +16,8 @@ const extensionPreferencesNavigationItemRegistratorInjectable = getInjectable({
id: "extension-preferences-navigation-item", id: "extension-preferences-navigation-item",
instantiate: (di) => { instantiate: (di) => {
return (extension: LensRendererExtension) => { return (ext) => {
const extension = ext as LensRendererExtension;
const navigateToExtensionPreferences = di.inject( const navigateToExtensionPreferences = di.inject(
navigateToExtensionPreferencesInjectable, navigateToExtensionPreferencesInjectable,
); );
@ -24,7 +25,7 @@ const extensionPreferencesNavigationItemRegistratorInjectable = getInjectable({
const extensionHasGeneralPreferences = extension.appPreferences.some(preferences => const extensionHasGeneralPreferences = extension.appPreferences.some(preferences =>
!preferences.showInPreferencesTab, !preferences.showInPreferencesTab,
); );
const isVisible = extensionHasPreferences && extensionHasGeneralPreferences; const isVisible = computed(() => extensionHasPreferences && extensionHasGeneralPreferences);
const extensionRoute = di.inject(extensionPreferencesRouteInjectable); const extensionRoute = di.inject(extensionPreferencesRouteInjectable);
const pathParameters = di.inject(currentPathParametersInjectable); const pathParameters = di.inject(currentPathParametersInjectable);
const routeIsActive = di.inject(routeIsActiveInjectable, extensionRoute); const routeIsActive = di.inject(routeIsActiveInjectable, extensionRoute);
@ -38,7 +39,7 @@ const extensionPreferencesNavigationItemRegistratorInjectable = getInjectable({
label: `${extension.name}`, label: `${extension.name}`,
navigate: () => navigateToExtensionPreferences(extension.sanitizedExtensionId), navigate: () => navigateToExtensionPreferences(extension.sanitizedExtensionId),
isActive, isActive,
isVisible: computed(() => isVisible), isVisible,
orderNumber: 20, orderNumber: 20,
fromExtension: true, fromExtension: true,
}), }),

2
src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts
View File

@ -12,7 +12,7 @@ const navigateToPreferenceTabInjectable = getInjectable({
instantiate: (di) => { instantiate: (di) => {
const navigateToRoute = di.inject(navigateToRouteInjectionToken); const navigateToRoute = di.inject(navigateToRouteInjectionToken);
return (route: Route<unknown>) => () => { return (route: Route) => () => {
navigateToRoute(route, { withoutAffectingBackButton: true }); navigateToRoute(route, { withoutAffectingBackButton: true });
}; };
}, },