From 847d1743a3db371116d26b96d55e79d305a8763b Mon Sep 17 00:00:00 2001
From: mario ma <mario.ma.node@gmail.com>
Date: Tue, 18 Jun 2024 16:27:59 +0800
Subject: [PATCH] fix: rebase conficts

Signed-off-by: mario ma <mario.ma.node@gmail.com>
---
 plugins/catalog/api-report-alpha.md |  2 --
 plugins/scaffolder/api-report.md    | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/plugins/catalog/api-report-alpha.md b/plugins/catalog/api-report-alpha.md
index 14d62d53bf..102e2a7aa3 100644
--- a/plugins/catalog/api-report-alpha.md
+++ b/plugins/catalog/api-report-alpha.md
@@ -17,8 +17,6 @@ import { TranslationRef } from '@backstage/core-plugin-api/alpha';
 export const catalogTranslationRef: TranslationRef<
   'catalog',
   {
-    readonly 'indexPage.title': '{{orgName}} Catalog';
-    readonly 'indexPage.createButtonTitle': 'Create';
     readonly 'deleteEntity.description': 'This entity is not referenced by any location and is therefore not receiving updates. Click here to delete.';
     readonly 'deleteEntity.cancelButtonTitle': 'Cancel';
     readonly 'deleteEntity.deleteButtonTitle': 'Delete';
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 5c766af890..7f16d4c787 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -81,8 +81,6 @@ export const EntityPickerFieldExtension: FieldExtensionComponent_2<
   {
     defaultKind?: string | undefined;
     defaultNamespace?: string | false | undefined;
-    allowedKinds?: string[] | undefined;
-    allowArbitraryValues?: boolean | undefined;
     catalogFilter?:
       | Record<
           string,
@@ -101,6 +99,8 @@ export const EntityPickerFieldExtension: FieldExtensionComponent_2<
             }
         >[]
       | undefined;
+    allowedKinds?: string[] | undefined;
+    allowArbitraryValues?: boolean | undefined;
   }
 >;
 
@@ -110,8 +110,6 @@ export const EntityPickerFieldSchema: FieldSchema<
   {
     defaultKind?: string | undefined;
     defaultNamespace?: string | false | undefined;
-    allowedKinds?: string[] | undefined;
-    allowArbitraryValues?: boolean | undefined;
     catalogFilter?:
       | Record<
           string,
@@ -130,6 +128,8 @@ export const EntityPickerFieldSchema: FieldSchema<
             }
         >[]
       | undefined;
+    allowedKinds?: string[] | undefined;
+    allowArbitraryValues?: boolean | undefined;
   }
 >;
 
@@ -216,7 +216,6 @@ export const MultiEntityPickerFieldExtension: FieldExtensionComponent_2<
   {
     defaultKind?: string | undefined;
     defaultNamespace?: string | false | undefined;
-    allowArbitraryValues?: boolean | undefined;
     catalogFilter?:
       | Record<
           string,
@@ -235,6 +234,7 @@ export const MultiEntityPickerFieldExtension: FieldExtensionComponent_2<
             }
         >[]
       | undefined;
+    allowArbitraryValues?: boolean | undefined;
   }
 >;
 
@@ -269,8 +269,6 @@ export const OwnedEntityPickerFieldExtension: FieldExtensionComponent_2<
   {
     defaultKind?: string | undefined;
     defaultNamespace?: string | false | undefined;
-    allowedKinds?: string[] | undefined;
-    allowArbitraryValues?: boolean | undefined;
     catalogFilter?:
       | Record<
           string,
@@ -289,6 +287,8 @@ export const OwnedEntityPickerFieldExtension: FieldExtensionComponent_2<
             }
         >[]
       | undefined;
+    allowedKinds?: string[] | undefined;
+    allowArbitraryValues?: boolean | undefined;
   }
 >;
 
@@ -298,8 +298,6 @@ export const OwnedEntityPickerFieldSchema: FieldSchema<
   {
     defaultKind?: string | undefined;
     defaultNamespace?: string | false | undefined;
-    allowedKinds?: string[] | undefined;
-    allowArbitraryValues?: boolean | undefined;
     catalogFilter?:
       | Record<
           string,
@@ -318,6 +316,8 @@ export const OwnedEntityPickerFieldSchema: FieldSchema<
             }
         >[]
       | undefined;
+    allowedKinds?: string[] | undefined;
+    allowArbitraryValues?: boolean | undefined;
   }
 >;
 
@@ -330,8 +330,6 @@ export const OwnerPickerFieldExtension: FieldExtensionComponent_2<
   string,
   {
     defaultNamespace?: string | false | undefined;
-    allowedKinds?: string[] | undefined;
-    allowArbitraryValues?: boolean | undefined;
     catalogFilter?:
       | Record<
           string,
@@ -350,6 +348,8 @@ export const OwnerPickerFieldExtension: FieldExtensionComponent_2<
             }
         >[]
       | undefined;
+    allowedKinds?: string[] | undefined;
+    allowArbitraryValues?: boolean | undefined;
   }
 >;
 
@@ -358,8 +358,6 @@ export const OwnerPickerFieldSchema: FieldSchema<
   string,
   {
     defaultNamespace?: string | false | undefined;
-    allowedKinds?: string[] | undefined;
-    allowArbitraryValues?: boolean | undefined;
     catalogFilter?:
       | Record<
           string,
@@ -378,6 +376,8 @@ export const OwnerPickerFieldSchema: FieldSchema<
             }
         >[]
       | undefined;
+    allowedKinds?: string[] | undefined;
+    allowArbitraryValues?: boolean | undefined;
   }
 >;