paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 44 Packages Projects Releases Wiki Activity

fix: rebase conficts

Browse Source 
Signed-off-by: mario ma <mario.ma.node@gmail.com>
This commit is contained in:
mario ma
2024-06-18 16:27:59 +08:00
parent 24208fce4e
commit 847d1743a3
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/catalog/api-report-alpha.md
-2
View File
@@ -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';
plugins/scaffolder/api-report.md
+13 -13
View File
@@ -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;
}
>;