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

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @backstage/plugin-catalog-react
 
+## 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
+
+- ef9ab322de: Minor API signatures cleanup
+- Updated dependencies
+  - @backstage/core-plugin-api@1.0.6-next.0
+  - @backstage/core-components@0.11.1-next.0
+  - @backstage/catalog-client@1.0.5-next.0
+  - @backstage/integration@1.3.1-next.0
+  - @backstage/plugin-permission-common@0.6.4-next.0
+  - @backstage/plugin-permission-react@0.4.5-next.0
+  - @backstage/plugin-catalog-common@1.0.6-next.0
+
+## 1.1.3
+
+### Patch Changes
+
+- 44e691a7f9: Modify description column to not use auto width.
+- Updated dependencies
+  - @backstage/integration@1.3.0
+  - @backstage/core-components@0.11.0
+  - @backstage/core-plugin-api@1.0.5
+  - @backstage/plugin-catalog-common@1.0.5
+  - @backstage/plugin-permission-react@0.4.4
+
 ## 1.1.3-next.2
 
 ### Patch Changes

package/alpha/package.json

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

package/dist/index.alpha.d.ts

@@ -109,13 +109,13 @@ export declare const columnFactories: Readonly<{
     createEntityRefColumn<T extends Entity>(options: {
         defaultKind?: string;
     }): TableColumn<T>;
-    createEntityRelationColumn<T_1 extends Entity>({ title, relation, defaultKind, filter: entityFilter, }: {
+    createEntityRelationColumn<T_1 extends Entity>(options: {
         title: string;
         relation: string;
-        defaultKind?: string | undefined;
+        defaultKind?: string;
         filter?: {
             kind: string;
-        } | undefined;
+        };
     }): TableColumn<T_1>;
     createOwnerColumn<T_2 extends Entity>(): TableColumn<T_2>;
     createDomainColumn<T_3 extends Entity>(): TableColumn<T_3>;
@@ -387,7 +387,7 @@ export declare const EntityTable: {
         createEntityRefColumn<T_1 extends Entity>(options: {
             defaultKind?: string | undefined;
         }): TableColumn<T_1>;
-        createEntityRelationColumn<T_2 extends Entity>({ title, relation, defaultKind, filter: entityFilter, }: {
+        createEntityRelationColumn<T_2 extends Entity>(options: {
             title: string;
             relation: string;
             defaultKind?: string | undefined;
@@ -441,6 +441,7 @@ export declare class EntityTextFilter implements EntityFilter {
     readonly value: string;
     constructor(value: string);
     filterEntity(entity: Entity): boolean;
+    private toUpperArray;
 }
 
 /**

package/dist/index.beta.d.ts

@@ -109,13 +109,13 @@ export declare const columnFactories: Readonly<{
     createEntityRefColumn<T extends Entity>(options: {
         defaultKind?: string;
     }): TableColumn<T>;
-    createEntityRelationColumn<T_1 extends Entity>({ title, relation, defaultKind, filter: entityFilter, }: {
+    createEntityRelationColumn<T_1 extends Entity>(options: {
         title: string;
         relation: string;
-        defaultKind?: string | undefined;
+        defaultKind?: string;
         filter?: {
             kind: string;
-        } | undefined;
+        };
     }): TableColumn<T_1>;
     createOwnerColumn<T_2 extends Entity>(): TableColumn<T_2>;
     createDomainColumn<T_3 extends Entity>(): TableColumn<T_3>;
@@ -387,7 +387,7 @@ export declare const EntityTable: {
         createEntityRefColumn<T_1 extends Entity>(options: {
             defaultKind?: string | undefined;
         }): TableColumn<T_1>;
-        createEntityRelationColumn<T_2 extends Entity>({ title, relation, defaultKind, filter: entityFilter, }: {
+        createEntityRelationColumn<T_2 extends Entity>(options: {
             title: string;
             relation: string;
             defaultKind?: string | undefined;
@@ -441,6 +441,7 @@ export declare class EntityTextFilter implements EntityFilter {
     readonly value: string;
     constructor(value: string);
     filterEntity(entity: Entity): boolean;
+    private toUpperArray;
 }
 
 /**

package/dist/index.d.ts

@@ -109,13 +109,13 @@ export declare const columnFactories: Readonly<{
     createEntityRefColumn<T extends Entity>(options: {
         defaultKind?: string;
     }): TableColumn<T>;
-    createEntityRelationColumn<T_1 extends Entity>({ title, relation, defaultKind, filter: entityFilter, }: {
+    createEntityRelationColumn<T_1 extends Entity>(options: {
         title: string;
         relation: string;
-        defaultKind?: string | undefined;
+        defaultKind?: string;
         filter?: {
             kind: string;
-        } | undefined;
+        };
     }): TableColumn<T_1>;
     createOwnerColumn<T_2 extends Entity>(): TableColumn<T_2>;
     createDomainColumn<T_3 extends Entity>(): TableColumn<T_3>;
@@ -387,7 +387,7 @@ export declare const EntityTable: {
         createEntityRefColumn<T_1 extends Entity>(options: {
             defaultKind?: string | undefined;
         }): TableColumn<T_1>;
-        createEntityRelationColumn<T_2 extends Entity>({ title, relation, defaultKind, filter: entityFilter, }: {
+        createEntityRelationColumn<T_2 extends Entity>(options: {
             title: string;
             relation: string;
             defaultKind?: string | undefined;
@@ -441,6 +441,7 @@ export declare class EntityTextFilter implements EntityFilter {
     readonly value: string;
     constructor(value: string);
     filterEntity(entity: Entity): boolean;
+    private toUpperArray;
 }
 
 /**

package/dist/index.esm.js

@@ -474,9 +474,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 {
@@ -1040,12 +1052,8 @@ const columnFactories = Object.freeze({
       }
     };
   },
-  createEntityRelationColumn({
-    title,
-    relation,
-    defaultKind,
-    filter: entityFilter
-  }) {
+  createEntityRelationColumn(options) {
+    const { title, relation, defaultKind, filter: entityFilter } = options;
     function getRelations(entity) {
       return getEntityRelations(entity, relation, entityFilter);
     }