diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx index ab6529fe86..f9d55571a7 100644 --- a/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx +++ b/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx @@ -271,6 +271,12 @@ describe('Install Component', () => { expect(screen.getByTestId('install-multi').parentElement).toHaveClass('overflow-y-auto') }) + it('should constrain the install step so the plugin list can scroll with many items', () => { + const { container } = render() + + expect(container.firstElementChild).toHaveClass('min-h-0', 'flex-1', 'overflow-hidden') + }) + it('should show singular text when one plugin is selected', async () => { render() diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx index 11f8784a64..aede6cbb83 100644 --- a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx +++ b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx @@ -170,8 +170,8 @@ const Install: FC = ({ const { canInstallPluginFromMarketplace } = useCanInstallPluginFromMarketplace() return ( - <> -
+
+

{t(`${i18nPrefix}.${selectedPluginsNum > 1 ? 'readyToInstallPackages' : 'readyToInstallPackage'}`, { ns: 'plugin', num: selectedPluginsNum })}

@@ -218,7 +218,7 @@ const Install: FC = ({
)} - +
) } export default React.memo(Install) diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx index cac6250550..65b74bcac0 100644 --- a/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx +++ b/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx @@ -292,6 +292,12 @@ describe('InstallFromLocalPackage', () => { expect(screen.getByTestId('is-bundle')).toHaveTextContent('true') }) + it('should constrain dialog height so bundle dependency lists can scroll', () => { + render() + + expect(screen.getByRole('dialog')).toHaveClass('max-h-[calc(100dvh-48px)]') + }) + it('should identify package file correctly', () => { render() diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx index b2a780dbdb..032c2197f1 100644 --- a/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx +++ b/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx @@ -93,7 +93,7 @@ const InstallFromLocalPackage: React.FC = ({ foldAnimInto() }} > - +
diff --git a/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx b/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx index 18fa634202..05d5640c96 100644 --- a/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx +++ b/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx @@ -212,6 +212,19 @@ describe('InstallFromMarketplace', () => { expect(screen.getByTestId('bundle-plugins-count')).toHaveTextContent('2') }) + it('should constrain bundle dialog height so dependency lists can scroll', () => { + const dependencies = createMockDependencies() + render( + , + ) + + expect(screen.getByRole('dialog')).toHaveClass('max-h-[calc(100dvh-48px)]') + }) + it('should pass isFromMarketPlace as true to bundle component', () => { const dependencies = createMockDependencies() render( diff --git a/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx b/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx index 523009abe1..a53b014e6e 100644 --- a/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx +++ b/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx @@ -77,7 +77,7 @@ const InstallFromMarketplace: React.FC = ({ foldAnimInto() }} > - +