From 914736b2bb2c9a5ef3265c32287f234fded83422 Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Sat, 25 May 2024 15:53:43 +0530 Subject: [PATCH 1/7] fixed autocomplete poppercomponent overlapping sidebar Signed-off-by: JeevaRamanathan --- .../EntityAutocompletePicker/EntityAutocompletePicker.tsx | 3 +++ .../src/components/EntityOwnerPicker/EntityOwnerPicker.tsx | 3 +++ .../EntityProcessingStatusPicker.tsx | 3 +++ .../TemplateCategoryPicker/TemplateCategoryPicker.tsx | 3 +++ 4 files changed, 12 insertions(+) diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx index d3c76a183d..8df0c367f6 100644 --- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx +++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx @@ -152,6 +152,9 @@ export function EntityAutocompletePicker< {label} + PopperComponent={popperProps => ( +
{popperProps.children}
+ )} multiple disableCloseOnSelect options={availableOptions} diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx index 88ff3945d1..f6f1746744 100644 --- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx +++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx @@ -178,6 +178,9 @@ export const EntityOwnerPicker = (props?: EntityOwnerPickerProps) => { Owner ( +
{popperProps.children}
+ )} multiple disableCloseOnSelect loading={loading} diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx index f7de5d72b1..692cf213ab 100644 --- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx +++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx @@ -73,6 +73,9 @@ export const EntityProcessingStatusPicker = () => { Processing Status + PopperComponent={popperProps => ( +
{popperProps.children}
+ )} multiple disableCloseOnSelect options={availableAdvancedItems} diff --git a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx index 24f8a21109..5247e86c53 100644 --- a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx +++ b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx @@ -78,6 +78,9 @@ export const TemplateCategoryPicker = () => { Categories + PopperComponent={popperProps => ( +
{popperProps.children}
+ )} multiple id="categories-picker" options={availableTypes} From fa8560edd52516cc357c452aa27957598d60daf6 Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Sat, 25 May 2024 16:01:05 +0530 Subject: [PATCH 2/7] added changeset Signed-off-by: JeevaRamanathan --- .changeset/pretty-spoons-knock.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/pretty-spoons-knock.md diff --git a/.changeset/pretty-spoons-knock.md b/.changeset/pretty-spoons-knock.md new file mode 100644 index 0000000000..f4f55c0c1b --- /dev/null +++ b/.changeset/pretty-spoons-knock.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-scaffolder-react': minor +'@backstage/plugin-catalog-react': minor +--- + +Prevents Autocomplete dropdown from overlapping sidebar on hovering it From 62c80557b638946f4c01569b5ede4338cb517543 Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Sat, 25 May 2024 18:42:43 +0530 Subject: [PATCH 3/7] added ReactNode to fix pipeline Signed-off-by: JeevaRamanathan --- .../EntityAutocompletePicker/EntityAutocompletePicker.tsx | 4 ++-- .../src/components/EntityOwnerPicker/EntityOwnerPicker.tsx | 4 ++-- .../EntityProcessingStatusPicker.tsx | 4 ++-- .../TemplateCategoryPicker/TemplateCategoryPicker.tsx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx index 8df0c367f6..4bd9f100f9 100644 --- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx +++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.tsx @@ -20,7 +20,7 @@ import Typography from '@material-ui/core/Typography'; import { makeStyles } from '@material-ui/core/styles'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import Autocomplete from '@material-ui/lab/Autocomplete'; -import React, { useEffect, useMemo, useState } from 'react'; +import React, { useEffect, useMemo, useState, ReactNode } from 'react'; import { useApi } from '@backstage/core-plugin-api'; import useAsync from 'react-use/esm/useAsync'; import { catalogApiRef } from '../../api'; @@ -153,7 +153,7 @@ export function EntityAutocompletePicker< {label} PopperComponent={popperProps => ( -
{popperProps.children}
+
{popperProps.children as ReactNode}
)} multiple disableCloseOnSelect diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx index f6f1746744..c6b738d18b 100644 --- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx +++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.tsx @@ -30,7 +30,7 @@ import CheckBoxIcon from '@material-ui/icons/CheckBox'; import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import Autocomplete from '@material-ui/lab/Autocomplete'; -import React, { useEffect, useMemo, useState } from 'react'; +import React, { useEffect, useMemo, useState, ReactNode } from 'react'; import { useEntityList } from '../../hooks/useEntityListProvider'; import { EntityOwnerFilter } from '../../filters'; import { useDebouncedEffect } from '@react-hookz/web'; @@ -179,7 +179,7 @@ export const EntityOwnerPicker = (props?: EntityOwnerPickerProps) => { Owner ( -
{popperProps.children}
+
{popperProps.children as ReactNode}
)} multiple disableCloseOnSelect diff --git a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx index 692cf213ab..9995aba936 100644 --- a/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx +++ b/plugins/catalog-react/src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.tsx @@ -24,7 +24,7 @@ import { makeStyles } from '@material-ui/core/styles'; import CheckBoxIcon from '@material-ui/icons/CheckBox'; import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; -import React, { useState } from 'react'; +import React, { useState, ReactNode } from 'react'; import { useEntityList } from '../../hooks'; import Autocomplete from '@material-ui/lab/Autocomplete'; @@ -74,7 +74,7 @@ export const EntityProcessingStatusPicker = () => { Processing Status PopperComponent={popperProps => ( -
{popperProps.children}
+
{popperProps.children as ReactNode}
)} multiple disableCloseOnSelect diff --git a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx index 5247e86c53..f2505ec148 100644 --- a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx +++ b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import React from 'react'; +import React, { ReactNode } from 'react'; import capitalize from 'lodash/capitalize'; import { Progress } from '@backstage/core-components'; import Box from '@material-ui/core/Box'; @@ -79,7 +79,7 @@ export const TemplateCategoryPicker = () => { PopperComponent={popperProps => ( -
{popperProps.children}
+
{popperProps.children as ReactNode}
)} multiple id="categories-picker" From bccc70acd1f0810e328a08c4355e2d65c7819ebb Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Sat, 25 May 2024 19:49:02 +0530 Subject: [PATCH 4/7] Retrigger Build Signed-off-by: JeevaRamanathan From 0e46e1384c57841fa6167361452e3ea1f5c07415 Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Wed, 5 Jun 2024 15:49:13 +0530 Subject: [PATCH 5/7] revert back to retrigger Signed-off-by: JeevaRamanathan From 106fb68ff844122f179b1f11fe24e8ef85cdca38 Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Wed, 5 Jun 2024 15:51:32 +0530 Subject: [PATCH 6/7] updated changeset Signed-off-by: JeevaRamanathan --- .changeset/pretty-spoons-knock.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/pretty-spoons-knock.md b/.changeset/pretty-spoons-knock.md index f4f55c0c1b..5eddce54d9 100644 --- a/.changeset/pretty-spoons-knock.md +++ b/.changeset/pretty-spoons-knock.md @@ -1,6 +1,6 @@ --- -'@backstage/plugin-scaffolder-react': minor -'@backstage/plugin-catalog-react': minor +'@backstage/plugin-scaffolder-react': patch +'@backstage/plugin-catalog-react': patch --- Prevents Autocomplete dropdown from overlapping sidebar on hovering it From a66a01bfc5cb54cf82e1960d0f65a74b2d5357a4 Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Wed, 5 Jun 2024 16:07:42 +0530 Subject: [PATCH 7/7] Retrigger Build Signed-off-by: JeevaRamanathan