Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui) Enable editing structured props on fields #11042

Merged
merged 3 commits into from
Aug 12, 2024
Merged

feat(ui) Enable editing structured props on fields #11042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78d3b9c
feat(ui) Enable editing structured props on fields
chriscollins3456 Jul 30, 2024
0120791
fix lint
chriscollins3456 Jul 31, 2024
9c2b336
fix broken props
chriscollins3456 Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions ...rc/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { SchemaField, StdDataType } from '../../../../../../../../types.generate
import { SectionHeader, StyledDivider } from './components';
import { mapStructuredPropertyValues } from '../../../../Properties/useStructuredProperties';
import StructuredPropertyValue from '../../../../Properties/StructuredPropertyValue';
import { EditColumn } from '../../../../Properties/Edit/EditColumn';
import { useGetEntityWithSchema } from '../../useGetEntitySchema';

const PropertyTitle = styled.div`
font-size: 14px;
Expand All @@ -13,6 +15,8 @@ const PropertyTitle = styled.div`

const PropertyWrapper = styled.div`
margin-bottom: 12px;
display: flex;
justify-content: space-between;
`;

const PropertiesWrapper = styled.div`
Expand All @@ -29,6 +33,7 @@ interface Props {

export default function FieldProperties({ expandedField }: Props) {
const { schemaFieldEntity } = expandedField;
const { refetch } = useGetEntityWithSchema(true);

if (!schemaFieldEntity?.structuredProperties?.properties?.length) return null;

Expand All @@ -43,23 +48,33 @@ export default function FieldProperties({ expandedField }: Props) {
const hasMultipleValues = valuesData.length > 1;

return (
<PropertyWrapper>
<PropertyTitle>{structuredProp.structuredProperty.definition.displayName}</PropertyTitle>
{hasMultipleValues ? (
<StyledList>
{valuesData.map((value) => (
<li>
<PropertyWrapper key={structuredProp.structuredProperty.urn}>
<div>
<PropertyTitle>
{structuredProp.structuredProperty.definition.displayName}
</PropertyTitle>
{hasMultipleValues ? (
<StyledList>
{valuesData.map((value) => (
<li>
<StructuredPropertyValue value={value} isRichText={isRichText} />
</li>
))}
</StyledList>
) : (
<>
{valuesData.map((value) => (
<StructuredPropertyValue value={value} isRichText={isRichText} />
</li>
))}
</StyledList>
) : (
<>
{valuesData.map((value) => (
<StructuredPropertyValue value={value} isRichText={isRichText} />
))}
</>
)}
))}
</>
)}
</div>
<EditColumn
structuredProperty={structuredProp.structuredProperty}
associatedUrn={schemaFieldEntity.urn}
values={valuesData.map((v) => v.value) || []}
refetch={refetch}
/>
</PropertyWrapper>
);
})}
Expand Down
17 changes: 11 additions & 6 deletions datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import { Button } from 'antd';
import React, { useState } from 'react';
import { PropertyRow } from '../types';
import EditStructuredPropertyModal from './EditStructuredPropertyModal';
import { StructuredPropertyEntity } from '../../../../../../types.generated';

interface Props {
propertyRow: PropertyRow;
structuredProperty?: StructuredPropertyEntity;
associatedUrn?: string;
values?: (string | number | null)[];
refetch?: () => void;
}

export function EditColumn({ propertyRow }: Props) {
export function EditColumn({ structuredProperty, associatedUrn, values, refetch }: Props) {
const [isEditModalVisible, setIsEditModalVisible] = useState(false);

if (!propertyRow.structuredProperty || propertyRow.structuredProperty?.definition.immutable) {
if (!structuredProperty || structuredProperty?.definition.immutable) {
return null;
}

Expand All @@ -21,9 +24,11 @@ export function EditColumn({ propertyRow }: Props) {
</Button>
<EditStructuredPropertyModal
isOpen={isEditModalVisible}
propertyRow={propertyRow}
structuredProperty={propertyRow.structuredProperty}
structuredProperty={structuredProperty}
associatedUrn={associatedUrn}
values={values}
closeModal={() => setIsEditModalVisible(false)}
refetch={refetch}
/>
</>
);
Expand Down
37 changes: 27 additions & 10 deletions datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Button, Modal, message } from 'antd';
import React from 'react';
import React, { useEffect, useMemo } from 'react';
import styled from 'styled-components';
import { PropertyRow } from '../types';
import StructuredPropertyInput from '../../../components/styled/StructuredProperty/StructuredPropertyInput';
import { PropertyValueInput, StructuredPropertyEntity } from '../../../../../../types.generated';
import { useUpsertStructuredPropertiesMutation } from '../../../../../../graphql/structuredProperties.generated';
Expand All @@ -17,19 +16,33 @@ const Description = styled.div`

interface Props {
isOpen: boolean;
propertyRow: PropertyRow;
structuredProperty: StructuredPropertyEntity;
associatedUrn?: string;
values?: (string | number | null)[];
closeModal: () => void;
refetch?: () => void;
}

export default function EditStructuredPropertyModal({ isOpen, propertyRow, structuredProperty, closeModal }: Props) {
const { refetch } = useEntityContext();
const urn = useMutationUrn();
const initialValues = propertyRow.values?.map((v) => v.value) || [];
const { selectedValues, selectSingleValue, toggleSelectedValue, updateSelectedValues } =
export default function EditStructuredPropertyModal({
isOpen,
structuredProperty,
associatedUrn,
values,
closeModal,
refetch,
}: Props) {
const { refetch: entityRefetch } = useEntityContext();
const mutationUrn = useMutationUrn();
const urn = associatedUrn || mutationUrn;
const initialValues = useMemo(() => values || [], [values]);
const { selectedValues, selectSingleValue, toggleSelectedValue, updateSelectedValues, setSelectedValues } =
useEditStructuredProperty(initialValues);
const [upsertStructuredProperties] = useUpsertStructuredPropertiesMutation();

useEffect(() => {
setSelectedValues(initialValues);
}, [isOpen, initialValues, setSelectedValues]);

function upsertProperties() {
message.loading('Updating...');
upsertStructuredProperties({
Expand All @@ -51,7 +64,11 @@ export default function EditStructuredPropertyModal({ isOpen, propertyRow, struc
},
})
.then(() => {
refetch();
if (refetch) {
refetch();
} else {
entityRefetch();
}
message.destroy();
message.success('Successfully updated structured property!');
closeModal();
Expand All @@ -67,7 +84,7 @@ export default function EditStructuredPropertyModal({ isOpen, propertyRow, struc

return (
<Modal
title={propertyRow.displayName}
title={structuredProperty.definition.displayName}
onCancel={closeModal}
open={isOpen}
width={650}
Expand Down
7 changes: 6 additions & 1 deletion datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ export const PropertiesTab = () => {
propertyTableColumns.push({
title: '',
width: '10%',
render: (propertyRow: PropertyRow) => <EditColumn propertyRow={propertyRow} />,
render: (propertyRow: PropertyRow) => (
<EditColumn
structuredProperty={propertyRow.structuredProperty}
values={propertyRow.values?.map((v) => v.value) || []}
/>
),
} as any);
}

Expand Down
Loading