rename swimlane -> group

Signed-off-by: jrusso1020 <jrusso@brex.com>
This commit is contained in:
jrusso1020
2021-11-27 12:31:59 -05:00
parent fa683cab7d
commit f3bcd52216
7 changed files with 46 additions and 40 deletions
+4 -4
View File
@@ -214,14 +214,14 @@ export const ScaffolderFieldExtensions: React_2.ComponentType;
// @public (undocumented)
export const ScaffolderPage: ({
TemplateCardComponent,
extraSwimlanes,
groups,
}: {
TemplateCardComponent?:
| ComponentType<{
template: TemplateEntityV1beta2;
}>
| undefined;
extraSwimlanes?:
groups?:
| {
title?: string | undefined;
titleComponent?: ReactNode;
@@ -249,7 +249,7 @@ export { scaffolderPlugin };
// @public (undocumented)
export const TemplateList: ({
TemplateCardComponent,
swimlane,
group,
}: TemplateListProps) => JSX.Element | null;
// Warning: (ae-missing-release-tag) "TemplateListProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -261,7 +261,7 @@ export type TemplateListProps = {
template: TemplateEntityV1beta2;
}>
| undefined;
swimlane?: {
group?: {
title?: string;
titleComponent?: React_2.ReactNode;
filter: (entity: Entity) => boolean;
+3 -6
View File
@@ -34,17 +34,14 @@ type RouterProps = {
TemplateCardComponent?:
| ComponentType<{ template: TemplateEntityV1beta2 }>
| undefined;
extraSwimlanes?: Array<{
groups?: Array<{
title?: string;
titleComponent?: React.ReactNode;
filter: (entity: Entity) => boolean;
}>;
};
export const Router = ({
TemplateCardComponent,
extraSwimlanes,
}: RouterProps) => {
export const Router = ({ TemplateCardComponent, groups }: RouterProps) => {
const outlet = useOutlet();
const customFieldExtensions = useElementFilter(outlet, elements =>
@@ -74,7 +71,7 @@ export const Router = ({
element={
<ScaffolderPage
TemplateCardComponent={TemplateCardComponent}
extraSwimlanes={extraSwimlanes}
groups={groups}
/>
}
/>
@@ -51,7 +51,7 @@ export type ScaffolderPageProps = {
TemplateCardComponent?:
| ComponentType<{ template: TemplateEntityV1beta2 }>
| undefined;
extraSwimlanes?: Array<{
groups?: Array<{
title?: string;
titleComponent?: React.ReactNode;
filter: (entity: Entity) => boolean;
@@ -60,16 +60,14 @@ export type ScaffolderPageProps = {
export const ScaffolderPageContents = ({
TemplateCardComponent,
extraSwimlanes,
groups,
}: ScaffolderPageProps) => {
const styles = useStyles();
const registerComponentLink = useRouteRef(registerComponentRouteRef);
const otherTemplatesSwimlane = {
title: extraSwimlanes ? 'Other Templates' : 'Templates',
const otherTemplatesGroup = {
title: groups ? 'Other Templates' : 'Templates',
filter: (entity: Entity) => {
const filtered = (extraSwimlanes ?? []).map(swimlane =>
swimlane.filter(entity),
);
const filtered = (groups ?? []).map(group => group.filter(entity));
return !filtered.some(result => result === true);
},
};
@@ -110,16 +108,16 @@ export const ScaffolderPageContents = ({
<EntityTagPicker />
</div>
<div>
{extraSwimlanes &&
extraSwimlanes.map(swimlane => (
{groups &&
groups.map(group => (
<TemplateList
TemplateCardComponent={TemplateCardComponent}
swimlane={swimlane}
group={group}
/>
))}
<TemplateList
TemplateCardComponent={TemplateCardComponent}
swimlane={otherTemplatesSwimlane}
group={otherTemplatesGroup}
/>
</div>
</div>
@@ -130,12 +128,12 @@ export const ScaffolderPageContents = ({
export const ScaffolderPage = ({
TemplateCardComponent,
extraSwimlanes,
groups,
}: ScaffolderPageProps) => (
<EntityListProvider>
<ScaffolderPageContents
TemplateCardComponent={TemplateCardComponent}
extraSwimlanes={extraSwimlanes}
groups={groups}
/>
</EntityListProvider>
);
@@ -35,7 +35,7 @@ export type TemplateListProps = {
TemplateCardComponent?:
| ComponentType<{ template: TemplateEntityV1beta2 }>
| undefined;
swimlane?: {
group?: {
title?: string;
titleComponent?: React.ReactNode;
filter: (entity: Entity) => boolean;
@@ -44,20 +44,20 @@ export type TemplateListProps = {
export const TemplateList = ({
TemplateCardComponent,
swimlane,
group,
}: TemplateListProps) => {
const { loading, error, entities } = useEntityListProvider();
const Card = TemplateCardComponent || TemplateCard;
const maybeFilteredEntities = swimlane
? entities.filter(e => swimlane.filter(e))
const maybeFilteredEntities = group
? entities.filter(e => group.filter(e))
: entities;
const title = swimlane ? (
swimlane.titleComponent || <ContentHeader title={swimlane.title} />
const title = group ? (
group.titleComponent || <ContentHeader title={group.title} />
) : (
<ContentHeader title="Other Templates" />
);
if (swimlane && maybeFilteredEntities.length === 0) {
if (group && maybeFilteredEntities.length === 0) {
return null;
}
return (