@backstage/plugin-catalog-react 1.1.4-next.0 → 1.1.4-next.2

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @backstage/plugin-catalog-react
 
+## 1.1.4-next.2
+
+### Patch Changes
+
+- f6033d1121: humanizeEntityRef function can now be forced to include default namespace
+- c86741a052: Support showing counts in option labels of the `EntityTagPicker`. You can enable this by adding the `showCounts` property
+- 7d47def9c4: Removed dependency on `@types/jest`.
+- Updated dependencies
+  - @backstage/catalog-client@1.1.0-next.2
+  - @backstage/catalog-model@1.1.1-next.0
+  - @backstage/core-components@0.11.1-next.3
+  - @backstage/core-plugin-api@1.0.6-next.3
+  - @backstage/errors@1.1.1-next.0
+  - @backstage/integration@1.3.1-next.2
+  - @backstage/plugin-permission-common@0.6.4-next.2
+  - @backstage/plugin-permission-react@0.4.5-next.2
+
+## 1.1.4-next.1
+
+### Patch Changes
+
+- 817f3196f6: Updated React Router dependencies to be peer dependencies.
+- a6d551fad9: Properly handle free-text entity filtering in the case of empty tag arrays
+- Updated dependencies
+  - @backstage/core-components@0.11.1-next.1
+  - @backstage/core-plugin-api@1.0.6-next.1
+  - @backstage/plugin-permission-react@0.4.5-next.1
+
 ## 1.1.4-next.0
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "1.1.4-next.0",
+  "version": "1.1.4-next.2",
   "main": "../dist/index.esm.js",
   "types": "../dist/index.alpha.d.ts"
 }

package/dist/index.alpha.d.ts

@@ -431,7 +431,12 @@ export declare class EntityTagFilter implements EntityFilter {
 }
 
 /** @public */
-export declare const EntityTagPicker: () => JSX.Element | null;
+export declare const EntityTagPicker: (props: EntityTagPickerProps) => JSX.Element | null;
+
+/** @public */
+export declare type EntityTagPickerProps = {
+    showCounts?: boolean;
+};
 
 /**
  * Filters entities where the text matches spec, title or tags.
@@ -441,6 +446,7 @@ export declare class EntityTextFilter implements EntityFilter {
     readonly value: string;
     constructor(value: string);
     filterEntity(entity: Entity): boolean;
+    private toUpperArray;
 }
 
 /**
@@ -492,9 +498,14 @@ export declare function getEntityRelations(entity: Entity | undefined, relationT
 /** @public */
 export declare function getEntitySourceLocation(entity: Entity, scmIntegrationsApi: ScmIntegrationRegistry): EntitySourceLocation | undefined;
 
-/** @public */
+/**
+ * @param defaultNamespace - if set to false then namespace is never omitted,
+ * if set to string which matches namespace of entity then omitted
+ *
+ * @public */
 export declare function humanizeEntityRef(entityRef: Entity | CompoundEntityRef, opts?: {
     defaultKind?: string;
+    defaultNamespace?: string | false;
 }): string;
 
 /**

package/dist/index.beta.d.ts

@@ -431,7 +431,12 @@ export declare class EntityTagFilter implements EntityFilter {
 }
 
 /** @public */
-export declare const EntityTagPicker: () => JSX.Element | null;
+export declare const EntityTagPicker: (props: EntityTagPickerProps) => JSX.Element | null;
+
+/** @public */
+export declare type EntityTagPickerProps = {
+    showCounts?: boolean;
+};
 
 /**
  * Filters entities where the text matches spec, title or tags.
@@ -441,6 +446,7 @@ export declare class EntityTextFilter implements EntityFilter {
     readonly value: string;
     constructor(value: string);
     filterEntity(entity: Entity): boolean;
+    private toUpperArray;
 }
 
 /**
@@ -492,9 +498,14 @@ export declare function getEntityRelations(entity: Entity | undefined, relationT
 /** @public */
 export declare function getEntitySourceLocation(entity: Entity, scmIntegrationsApi: ScmIntegrationRegistry): EntitySourceLocation | undefined;
 
-/** @public */
+/**
+ * @param defaultNamespace - if set to false then namespace is never omitted,
+ * if set to string which matches namespace of entity then omitted
+ *
+ * @public */
 export declare function humanizeEntityRef(entityRef: Entity | CompoundEntityRef, opts?: {
     defaultKind?: string;
+    defaultNamespace?: string | false;
 }): string;
 
 /**

package/dist/index.d.ts

@@ -431,7 +431,12 @@ export declare class EntityTagFilter implements EntityFilter {
 }
 
 /** @public */
-export declare const EntityTagPicker: () => JSX.Element | null;
+export declare const EntityTagPicker: (props: EntityTagPickerProps) => JSX.Element | null;
+
+/** @public */
+export declare type EntityTagPickerProps = {
+    showCounts?: boolean;
+};
 
 /**
  * Filters entities where the text matches spec, title or tags.
@@ -441,6 +446,7 @@ export declare class EntityTextFilter implements EntityFilter {
     readonly value: string;
     constructor(value: string);
     filterEntity(entity: Entity): boolean;
+    private toUpperArray;
 }
 
 /**
@@ -492,9 +498,14 @@ export declare function getEntityRelations(entity: Entity | undefined, relationT
 /** @public */
 export declare function getEntitySourceLocation(entity: Entity, scmIntegrationsApi: ScmIntegrationRegistry): EntitySourceLocation | undefined;
 
-/** @public */
+/**
+ * @param defaultNamespace - if set to false then namespace is never omitted,
+ * if set to string which matches namespace of entity then omitted
+ *
+ * @public */
 export declare function humanizeEntityRef(entityRef: Entity | CompoundEntityRef, opts?: {
     defaultKind?: string;
+    defaultNamespace?: string | false;
 }): string;
 
 /**

package/dist/index.esm.js

@@ -371,7 +371,14 @@ function humanizeEntityRef(entityRef, opts) {
     namespace = entityRef.namespace;
     name = entityRef.name;
   }
-  if (namespace === DEFAULT_NAMESPACE) {
+  if (namespace === void 0 || namespace === "") {
+    namespace = DEFAULT_NAMESPACE;
+  }
+  if ((opts == null ? void 0 : opts.defaultNamespace) !== void 0) {
+    if ((opts == null ? void 0 : opts.defaultNamespace) === namespace) {
+      namespace = void 0;
+    }
+  } else if (namespace === DEFAULT_NAMESPACE) {
     namespace = void 0;
   }
   kind = kind.toLocaleLowerCase("en-US");
@@ -474,9 +481,21 @@ class EntityTextFilter {
     this.value = value;
   }
   filterEntity(entity) {
-    var _a;
-    const upperCaseValue = this.value.toLocaleUpperCase("en-US");
-    return entity.metadata.name.toLocaleUpperCase("en-US").includes(upperCaseValue) || `${entity.metadata.title}`.toLocaleUpperCase("en-US").includes(upperCaseValue) || ((_a = entity.metadata.tags) == null ? void 0 : _a.join("").toLocaleUpperCase("en-US").indexOf(upperCaseValue)) !== -1;
+    const words = this.toUpperArray(this.value.split(/\s/));
+    const exactMatch = this.toUpperArray([entity.metadata.tags]);
+    const partialMatch = this.toUpperArray([
+      entity.metadata.name,
+      entity.metadata.title
+    ]);
+    for (const word of words) {
+      if (exactMatch.every((m) => m !== word) && partialMatch.every((m) => !m.includes(word))) {
+        return false;
+      }
+    }
+    return true;
+  }
+  toUpperArray(value) {
+    return value.flat().filter((m) => Boolean(m)).map((m) => m.toLocaleUpperCase("en-US"));
   }
 }
 class EntityOwnerFilter {
@@ -1189,7 +1208,7 @@ const icon$1 = /* @__PURE__ */ React.createElement(CheckBoxOutlineBlankIcon, {
 const checkedIcon$1 = /* @__PURE__ */ React.createElement(CheckBoxIcon, {
   fontSize: "small"
 });
-const EntityTagPicker = () => {
+const EntityTagPicker = (props) => {
   var _a, _b;
   const classes = useStyles$8();
   const {
@@ -1205,7 +1224,9 @@ const EntityTagPicker = () => {
       facets: [facet],
       filter: (_a2 = filters.kind) == null ? void 0 : _a2.getCatalogFilters()
     });
-    return facets[facet].map(({ value }) => value);
+    return Object.fromEntries(
+      facets[facet].map(({ value, count }) => [value, count])
+    );
   }, [filters.kind]);
   const queryParamTags = useMemo(
     () => [tagsParameter].flat().filter(Boolean),
@@ -1224,7 +1245,7 @@ const EntityTagPicker = () => {
       tags: selectedTags.length ? new EntityTagFilter(selectedTags) : void 0
     });
   }, [selectedTags, updateFilters]);
-  if (!(availableTags == null ? void 0 : availableTags.length))
+  if (!Object.keys(availableTags != null ? availableTags : {}).length)
     return null;
   return /* @__PURE__ */ React.createElement(Box, {
     pb: 1,
@@ -1234,7 +1255,7 @@ const EntityTagPicker = () => {
     component: "label"
   }, "Tags", /* @__PURE__ */ React.createElement(Autocomplete, {
     multiple: true,
-    options: availableTags,
+    options: Object.keys(availableTags != null ? availableTags : {}),
     value: selectedTags,
     onChange: (_, value) => setSelectedTags(value),
     renderOption: (option, { selected }) => /* @__PURE__ */ React.createElement(FormControlLabel, {
@@ -1243,7 +1264,7 @@ const EntityTagPicker = () => {
         checkedIcon: checkedIcon$1,
         checked: selected
       }),
-      label: option
+      label: props.showCounts ? `${option} (${availableTags == null ? void 0 : availableTags[option]})` : option
     }),
     size: "small",
     popupIcon: /* @__PURE__ */ React.createElement(ExpandMoreIcon, {