Skip to content

Commit c9584a4

Browse files
authored
Added support for object template on a generic (#5873)
1 parent 5bdc121 commit c9584a4

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

frontend/app/src/entities/nodes/object-template/object-template-form.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ObjectTemplateAutocomplete } from "@/entities/nodes/object-template/object-template-autocomplete";
22
import { NodeObject } from "@/entities/nodes/types";
3+
import { TemplateSchema } from "@/entities/schema/types";
34
import { useSchema } from "@/entities/schema/ui/hooks/useSchema";
45
import { Popover } from "@/shared/components/aria/popover";
56
import ObjectForm, { ObjectFormProps } from "@/shared/components/form/object-form";
@@ -37,7 +38,7 @@ const StartFromTemplateButton = ({
3738
objectTemplateSchema,
3839
onSelect,
3940
}: {
40-
objectTemplateSchema: any;
41+
objectTemplateSchema: TemplateSchema;
4142
onSelect: (template: NodeObject | null) => void;
4243
}) => {
4344
let buttonRef = useRef<HTMLButtonElement>(null);

frontend/app/src/shared/components/form/generic-object-form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const GenericObjectForm = ({ genericSchema, ...props }: GenericObjectForm
2828
onChange={setKindToCreate}
2929
/>
3030

31-
{kindToCreate && <ObjectForm kind={kindToCreate} {...props} />}
31+
{kindToCreate && <ObjectForm key={kindToCreate} kind={kindToCreate} {...props} />}
3232
</>
3333
);
3434
};

frontend/app/src/shared/components/form/object-form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const ObjectForm = ({ kind, currentProfiles, ...props }: ObjectFormProps) => {
6262
);
6363
}
6464

65-
if (!props.isUpdate) {
65+
if (!props.isUpdate && !isGeneric) {
6666
const objectTemplateRelationship = getTemplateRelationshipFromSchema(schema);
6767
if (objectTemplateRelationship && props.objectTemplate === undefined) {
6868
return (

0 commit comments

Comments
 (0)