Merge pull request #17 from rtekal/rtekal-pl-join-ui-ERModelRelation

UI display: ER-Model-Relation

Author: rtekal

datahub-web-react/src/app/entity/ermodelrelations/ERModelRelationEntity.tsx

@@ -53,7 +53,7 @@ export class ERModelRelationEntity implements Entity<ErModelRelation> {
 
     getCollectionName = () => '';
 
-    getEntityName = () => 'ERModelRelation';
+    getEntityName = () => 'ER-Model-Relation';
 
     renderProfile = (urn: string) => (
         <EntityProfile
@@ -64,7 +64,7 @@ export class ERModelRelationEntity implements Entity<ErModelRelation> {
             getOverrideProperties={this.getOverridePropertiesFromEntity}
             tabs={[
                 {
-                    name: 'ERModelRelation',
+                    name: 'ER-Model-Relation',
                     component: ERModelRelationTab,
                 },
                 {

datahub-web-react/src/app/entity/shared/components/styled/ERModelRelation/CreateERModelRelationModal.tsx

@@ -324,7 +324,7 @@ export const CreateERModelRelationModal = ({
         <Modal
             title={
                 <div className="footer-parent-div">
-                    <p className="ermodelrelation-title">ERModelRelation parameters</p>
+                    <p className="ermodelrelation-title">ER-Model-Relation Parameters</p>
                     <div>
                         <Button onClick={onCancelSelect} className="cancel-btn" size="large">
                             Cancel
@@ -352,7 +352,7 @@ export const CreateERModelRelationModal = ({
                 <p className="all-content-heading">Table 2</p>
                 <p className="all-information">{table2NameBusiness}</p>
                 <div className="techNameDisplay">{table2NameTech !== table2NameBusiness && table2NameTech}</div>
-                <p className="all-content-heading">ERModelRelation name</p>
+                <p className="all-content-heading">ER-Model-Relation name</p>
                 <Form
                     form={form}
                     layout="vertical"
@@ -368,15 +368,15 @@ export const CreateERModelRelationModal = ({
                         rules={[
                             {
                                 required: true,
-                                message: `ERModelRelation name is required.`,
+                                message: `ER-Model-Relation name is required.`,
                             },
                             {
                                 validator: (_, value) =>
                                     checkDuplicateERModelRelation(getSearchResultsERModelRelations, value?.trim()).then((result) => {
                                         return result === true && !isEditing
                                             ? Promise.reject(
                                                   new Error(
-                                                      'This ermodelrelation name already exists. A unique name for each ermodelrelation is required.',
+                                                      'This ER-Model-Relation name already exists. A unique name for each ER-Model-Relation is required.',
                                                   ),
                                               )
                                             : Promise.resolve();
@@ -398,11 +398,11 @@ export const CreateERModelRelationModal = ({
                     <Button type="link" className="add-btn-link" onClick={handleAdd}>
                         <PlusOutlined /> Add Row
                     </Button>
-                    <p className="all-content-heading">ERModelRelation details</p>
+                    <p className="all-content-heading">ER-Model-Relation details</p>
                     <Form.Item style={{ margin: 0 }} name="ermodelrelationDetails">
                         <TextArea
                             className="ermodelrelation-details-ta"
-                            placeholder="Please enter ermodelrelation details here"
+                            placeholder="Please enter ER-Model-Relation details here"
                             onChange={(e) => setDetails(e.target.value)}
                         />
                     </Form.Item>

datahub-web-react/src/app/entity/shared/components/styled/ERModelRelation/ERModelRelationPreview.tsx

@@ -149,7 +149,7 @@ export const ERModelRelationPreview = ({ ermodelrelationData, baseEntityUrn, pre
                             {prePageType === 'Dataset' && (
                                 <Button type="link" onClick={() => handleViewEntity(EntityType.Ermodelrelation, ermodelrelationData?.urn)}>
                                     <div className="div-view">
-                                        View ermodelrelation <RightOutlined />{' '}
+                                        View ER-Model-Relation <RightOutlined />{' '}
                                     </div>
                                 </Button>
                             )}
@@ -165,7 +165,7 @@ export const ERModelRelationPreview = ({ ermodelrelationData, baseEntityUrn, pre
                         }}
                     >
                         <div className="div-edit-img">
-                            <img src={editIcon} alt="" /> <div className="div-edit">Edit ERModelRelation</div>
+                            <img src={editIcon} alt="" /> <div className="div-edit">Edit ER-Model-Relation</div>
                             {prePageType === 'ERModelRelation' && <div className="extra-margin-rev" />}
                         </div>
                     </Button>
@@ -182,7 +182,7 @@ export const ERModelRelationPreview = ({ ermodelrelationData, baseEntityUrn, pre
             </Row>
             {prePageType === 'Dataset' && (
                 <div>
-                    <p className="all-content-heading">ERModelRelation details</p>
+                    <p className="all-content-heading">ER-Model-Relation details</p>
                     <p className="all-content-info">{ermodelrelationData?.editableProperties?.description}</p>
                 </div>
             )}

datahub-web-react/src/app/entity/shared/components/styled/ERModelRelation/ERModelRelationUtils.tsx

@@ -41,14 +41,14 @@ export const validateERModelRelation = async (nameField: string, tableSchema: ER
     const errors: string[] = [];
     const bDuplicateName = await checkDuplicateERModelRelation(getSearchResultsERModelRelations, nameField?.trim()).then((result) => result);
     if (nameField === '') {
-        errors.push('ERModelRelation name is required');
+        errors.push('ER-Model-Relation name is required');
     }
     if (bDuplicateName && !editFlag) {
-        errors.push('This ermodelrelation name already exists. A unique name for each ermodelrelation is required');
+        errors.push('This ER-Model-Relation name already exists. A unique name for each ER-Model-Relation is required');
     }
     const faultyRows = tableSchema.filter((item) => validateTableData(item) !== true);
     if (faultyRows.length > 0) {
-        errors.push('Please fill out or remove all empty ERModelRelation fields');
+        errors.push('Please fill out or remove all empty ER-Model-Relation fields');
     }
     return errors;
 };

datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx

@@ -52,7 +52,7 @@ export const RelationshipsTab = () => {
     const tabs = [
         {
             key: 'ermodelrelationsTab',
-            tab: 'ERModelRelations',
+            tab: 'ER-Model-Relations',
         },
     ];
     const {
@@ -125,7 +125,7 @@ export const RelationshipsTab = () => {
                     )}
                     {loadingERModelRelation && (
                         <div>
-                            ERModelRelations <LoadingOutlined />
+                            ER-Model-Relations <LoadingOutlined />
                         </div>
                     )}
                 </>
@@ -248,7 +248,7 @@ export const RelationshipsTab = () => {
                             setermodelrelationModalVisible(true);
                         }}
                     >
-                        <PlusOutlined /> Add ERModelRelation
+                        <PlusOutlined /> Add ER-Model-Relation
                     </Button>
                 </div>{' '}
                 <br />