Merge branch 'datahub-project:master' into master

datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx

@@ -102,7 +102,7 @@ export default function SchemaTable({
 
     const schemaFields = schemaMetadata ? schemaMetadata.fields : inputFields;
 
-    const descriptionRender = useDescriptionRenderer();
+    const descriptionRender = useDescriptionRenderer(editableSchemaMetadata);
     const usageStatsRenderer = useUsageStatsRenderer(usageStats);
     const tagRenderer = useTagsAndTermsRenderer(
         editableSchemaMetadata,

datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx

@@ -1,12 +1,13 @@
 import React, { useState } from 'react';
 import DOMPurify from 'dompurify';
-import { SchemaField, SubResourceType } from '../../../../../../../types.generated';
+import { EditableSchemaMetadata, SchemaField, SubResourceType } from '../../../../../../../types.generated';
 import DescriptionField from '../../../../../dataset/profile/schema/components/SchemaDescriptionField';
 import { useUpdateDescriptionMutation } from '../../../../../../../graphql/mutations.generated';
 import { useMutationUrn, useRefetch } from '../../../../EntityContext';
 import { useSchemaRefetch } from '../SchemaContext';
+import { pathMatchesNewPath } from '../../../../../dataset/profile/schema/utils/utils';
 
-export default function useDescriptionRenderer() {
+export default function useDescriptionRenderer(editableSchemaMetadata: EditableSchemaMetadata | null | undefined) {
     const urn = useMutationUrn();
     const refetch = useRefetch();
     const schemaRefetch = useSchemaRefetch();
@@ -20,7 +21,10 @@ export default function useDescriptionRenderer() {
     };
 
     return (description: string, record: SchemaField, index: number): JSX.Element => {
-        const displayedDescription = record?.description || description;
+        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find(
+            (candidateEditableFieldInfo) => pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
+        );
+        const displayedDescription = relevantEditableFieldInfo?.description || description;
         const sanitizedDescription = DOMPurify.sanitize(displayedDescription);
         const original = record.description ? DOMPurify.sanitize(record.description) : undefined;
         const businessAttributeDescription =
@@ -39,7 +43,7 @@ export default function useDescriptionRenderer() {
                 baExpanded={!!expandedBARows[index]}
                 description={sanitizedDescription}
                 original={original}
-                isEdited={!!record.description}
+                isEdited={!!relevantEditableFieldInfo?.description}
                 onUpdate={(updatedDescription) =>
                     updateDescription({
                         variables: {

docker/kafka-setup/Dockerfile

@@ -1,4 +1,4 @@
-ARG KAFKA_DOCKER_VERSION=7.4.1
+ARG KAFKA_DOCKER_VERSION=7.4.4
 
 # Defining custom repo urls for use in enterprise environments. Re-used between stages below.
 ARG ALPINE_REPO_URL=http://dl-cdn.alpinelinux.org/alpine

docs-website/sidebars.js

@@ -421,6 +421,7 @@ module.exports = {
       "Advanced Guides": [
         "docs/how/delete-metadata",
         "docs/how/configuring-authorization-with-apache-ranger",
+        "docs/managed-datahub/configuring-identity-provisioning-with-ms-entra",
         "docs/how/backup-datahub",
         "docs/how/restore-indices",
         "docs/advanced/db-retention",

docs/managed-datahub/configuring-identity-provisioning-with-ms-entra.md

@@ -0,0 +1,63 @@
+---
+title: "Configuring MS Entra with DataHub"
+hide_title: true
+---
+import FeatureAvailability from '@site/src/components/FeatureAvailability';
+
+# Entity Events API
+<FeatureAvailability saasOnly />
+
+# Configuring User/Group/Roles provisioning from MS Entra to DataHub
+
+1. **Generate Personal Access Token**: 
+    Generate a personal access token from [DataHub](https://datahubproject.io/docs/next/authentication/personal-access-tokens/#creating-personal-access-tokens).
+
+2. **Integrate DataHub With MS Entra**: Follow steps [Integrate your SCIM endpoint with the Microsoft Entra provisioning service](https://learn.microsoft.com/en-gb/entra/identity/app-provisioning/use-scim-to-provision-users-and-groups#integrate-your-scim-endpoint-with-the-microsoft-entra-provisioning-service) to integrate DataHub SCIM endpoint into MS Entra.
+
+    a. Set the `Tenant URL` to `https://<hostname>/gms/openapi/scim/v2`. Replace `<hostname>` with your DataHub instance hostname.
+
+    b. Set the `Secret Token` to Personal Access Token created in Step 1.
+
+3. **Update Attribute Mapping For Role**: 
+
+    a. Go to `Provisioning` section inside the App and click on `Provision Microsoft Entra ID Users` as shown in below image 
+
+    <p>
+    <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/provisioning.png"/>
+    </p>
+
+    b. Click on `Add Mapping`
+
+    <p>
+    <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/add-new-mapping.png"/>
+    </p>
+
+    c. Fill detail as shown in below image
+
+    <p>
+    <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/edit-mapping-form.png"/>
+    </p>
+
+    d. **Create Role**: Go to `Provisioning` section and click on `application registration.` to create the role 
+
+    <p>
+    <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/application-registration.png"/>
+    </p>
+
+    Create three roles having `Display Name` and `Value` as mentioned below 
+
+    - Admin
+    - Editor
+    - Reader 
+
+    e. While creating the App Role set `Allowed member types` to `Users/Groups`
+
+4. **Add Users/Groups/Roles in the App**: Go to application created in step #1 and click on `Add user/group` as shown in below image 
+
+    <p>
+    <img width="70%"  src="https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/scim/add-user-group.png"/>
+    </p>
+
+    On the screen choose 
+    - Group/User 
+    - And role for the Group/User. The role should be one of the role created in Step 3