From f8f492130d208c93f7a48b7ee5219cfd959d4491 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Tue, 1 Jun 2021 23:16:38 +0800
Subject: [PATCH 01/21] fix(react): update autocomplete ui

---
 datahub-web-react/src/app/search/SearchBar.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/datahub-web-react/src/app/search/SearchBar.tsx b/datahub-web-react/src/app/search/SearchBar.tsx
index 117c6ba6e06dd1..ac8f1858845a5b 100644
--- a/datahub-web-react/src/app/search/SearchBar.tsx
+++ b/datahub-web-react/src/app/search/SearchBar.tsx
@@ -23,9 +23,9 @@ const ExploreForEntity = styled.span`
     font-size: 11px;
 `;
 
-const styles = {
-    autoComplete: { width: 650 },
-};
+const StyledAutoComplete = styled(AutoComplete)`
+    width: 650px;
+`;
 
 const renderItem = (suggestion: string, icon: JSX.Element, type: string) => ({
     value: suggestion,
@@ -91,14 +91,15 @@ export const SearchBar = ({
 
     return (
         <div style={style}>
-            <AutoComplete
-                style={autoCompleteStyle || styles.autoComplete}
+            <StyledAutoComplete
+                style={autoCompleteStyle}
                 options={options}
                 onSelect={(value: string, option) => onSearch(filterSearchQuery(value), option.type)}
                 onSearch={(value: string) => onQueryChange(value)}
                 defaultValue={initialQuery || undefined}
                 value={selected}
                 onChange={(v) => setSelected(filterSearchQuery(v))}
+                dropdownStyle={{ maxHeight: 1000, overflowY: 'visible' }}
             >
                 <Input.Search
                     placeholder={placeholderText}
@@ -107,7 +108,7 @@ export const SearchBar = ({
                     onChange={(e) => setSearchQuery(e.target.value)}
                     data-testid="search-input"
                 />
-            </AutoComplete>
+            </StyledAutoComplete>
         </div>
     );
 };

From a58a860af446f0b92240055074b2d5f574d3741c Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Wed, 2 Jun 2021 01:51:13 +0800
Subject: [PATCH 02/21] feat(react): add markdown deps, fix schema description

---
 datahub-web-react/package.json                |   1 +
 .../entity/dataset/profile/schema/Schema.tsx  |   2 -
 .../profile/schema/SchemaDescriptionField.tsx |  91 +++--
 datahub-web-react/yarn.lock                   | 354 +++++++++++++++++-
 4 files changed, 402 insertions(+), 46 deletions(-)

diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json
index dafc2d949fec6f..06d634b8eef275 100644
--- a/datahub-web-react/package.json
+++ b/datahub-web-react/package.json
@@ -25,6 +25,7 @@
         "@types/react-dom": "^17.0.0",
         "@types/react-router": "^5.1.8",
         "@types/react-router-dom": "^5.1.6",
+        "@uiw/react-md-editor": "^3.3.4",
         "@visx/drag": "^1.7.0",
         "@visx/responsive": "^1.7.0",
         "@vx/axis": "^0.0.199",
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
index a992143fbc05c1..bf871b44263492 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
@@ -291,8 +291,6 @@ export default function SchemaView({ urn, schema, editableSchemaMetadata, update
                         dataSource={rows}
                         rowKey="fieldPath"
                         expandable={{ defaultExpandAllRows: true, expandRowByClick: true }}
-                        defaultExpandAllRows
-                        expandRowByClick
                         pagination={false}
                     />
                 )
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
index 5363157533a5d2..ccb72e6c602413 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
@@ -69,46 +69,63 @@ export default function DescriptionField({ description, updatedDescription, onHo
     return (
         <DescriptionContainer>
             <DescriptionText>{updatedDescription || description}</DescriptionText>
-            {onHover && <EditIcon twoToneColor="#52c41a" onClick={() => setShowAddModal(true)} />}
+            {onHover && (
+                <EditIcon
+                    twoToneColor="#52c41a"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        setShowAddModal(true);
+                    }}
+                />
+            )}
             {showAddModal && (
-                <Modal
-                    title="Update description"
-                    visible
-                    onCancel={onCloseModal}
-                    okButtonProps={{ disabled: !updatedDesc || updatedDesc.length === 0 }}
-                    okText="Update"
-                    footer={
-                        <>
-                            <Button onClick={onCloseModal}>Cancel</Button>
-                            <Button
-                                onClick={onUpdateModal}
-                                disabled={
-                                    !updatedDesc ||
-                                    updatedDesc.length === 0 ||
-                                    updatedDesc === (updatedDescription || description)
-                                }
-                            >
-                                Update
-                            </Button>
-                        </>
-                    }
+                <div
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }}
+                    aria-hidden="true"
                 >
-                    <Form layout="vertical">
-                        {(updatedDescription || description) && (
-                            <Form.Item label={<FormLabel>Original:</FormLabel>}>
-                                <DescriptionTextInModal>{description}</DescriptionTextInModal>
+                    <Modal
+                        title="Update description"
+                        visible
+                        onCancel={onCloseModal}
+                        okButtonProps={{ disabled: !updatedDesc || updatedDesc.length === 0 }}
+                        okText="Update"
+                        footer={
+                            <>
+                                <Button onClick={onCloseModal}>Cancel</Button>
+                                <Button
+                                    onClick={onUpdateModal}
+                                    disabled={
+                                        !updatedDesc ||
+                                        updatedDesc.length === 0 ||
+                                        updatedDesc === (updatedDescription || description)
+                                    }
+                                >
+                                    Update
+                                </Button>
+                            </>
+                        }
+                    >
+                        <Form layout="vertical">
+                            {(updatedDescription || description) && (
+                                <Form.Item label={<FormLabel>Original:</FormLabel>}>
+                                    <DescriptionTextInModal>{description}</DescriptionTextInModal>
+                                </Form.Item>
+                            )}
+                            <Form.Item label={<FormLabel>Updated:</FormLabel>}>
+                                <TextArea
+                                    value={updatedDesc}
+                                    onChange={(e) => setDesc(e.target.value)}
+                                    placeholder="Description"
+                                    autoSize={{ minRows: 2, maxRows: 6 }}
+                                />
                             </Form.Item>
-                        )}
-                        <Form.Item label={<FormLabel>Updated:</FormLabel>}>
-                            <TextArea
-                                value={updatedDesc}
-                                onChange={(e) => setDesc(e.target.value)}
-                                placeholder="Description"
-                                autoSize={{ minRows: 2, maxRows: 6 }}
-                            />
-                        </Form.Item>
-                    </Form>
-                </Modal>
+                        </Form>
+                    </Modal>
+                </div>
             )}
             {updatedDescription && <EditedLabel>(edited)</EditedLabel>}
         </DescriptionContainer>
diff --git a/datahub-web-react/yarn.lock b/datahub-web-react/yarn.lock
index 7cb1ad003740f7..b49b2fcc9ff41f 100644
--- a/datahub-web-react/yarn.lock
+++ b/datahub-web-react/yarn.lock
@@ -1396,7 +1396,14 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.17", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@7.13.10":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
+  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.17", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
   integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
@@ -2288,6 +2295,15 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@mapbox/rehype-prism@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/rehype-prism/-/rehype-prism-0.6.0.tgz#3d8a860870951d4354257d0ba908d11545bd5ed5"
+  integrity sha512-/0Ev/PB4fXdKPT6VDzVpnAPxGpWFIc4Yz3mf/DzLEMxlpIPZpZlCzaFk4V4NGFofQXPc41+GpEcZtWP3VuFWVA==
+  dependencies:
+    hast-util-to-string "^1.0.4"
+    refractor "^3.3.1"
+    unist-util-visit "^2.0.3"
+
 "@mdx-js/loader@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4"
@@ -3987,6 +4003,26 @@
     "@typescript-eslint/types" "4.25.0"
     eslint-visitor-keys "^2.0.0"
 
+"@uiw/react-markdown-preview@3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@uiw/react-markdown-preview/-/react-markdown-preview-3.0.6.tgz#579900465f6d974c1a3e13c3a04db4113d0eb4db"
+  integrity sha512-eCr9DhesubOqjCpCE+kGWogduWAnzbtzPPCej46TJTGSqt9MieNnRcGWLBRAsW40Db+NV2mbYmgCLSfEFimhzQ==
+  dependencies:
+    "@babel/runtime" "7.13.10"
+    "@mapbox/rehype-prism" "0.6.0"
+    react-markdown "6.0.2"
+    rehype-raw "5.1.0"
+    remark-gfm "1.0.0"
+
+"@uiw/react-md-editor@^3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@uiw/react-md-editor/-/react-md-editor-3.3.4.tgz#2b59b248102b75abc0bc01a79a879d0f4d84afd4"
+  integrity sha512-GNIvPwAvMGqMa1rvjgyMbiZ92TuxyjWtOlYl7gDuikkSY+JFdBVU4wcmbTxQgc4lk389ZEGVEODi0nYYmH9sjg==
+  dependencies:
+    "@babel/runtime" "^7.14.0"
+    "@uiw/react-markdown-preview" "3.0.6"
+    rehype "11.0.0"
+
 "@visx/drag@^1.7.0":
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/@visx/drag/-/drag-1.7.4.tgz#263b487ee14bcec66eb424c04f07bf81f4608606"
@@ -6208,6 +6244,11 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
+character-entities-html4@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+  integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
+
 character-entities-legacy@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
@@ -7379,7 +7420,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
@@ -9574,6 +9615,11 @@ hast-util-from-parse5@^6.0.0:
     vfile-location "^3.2.0"
     web-namespaces "^1.0.0"
 
+hast-util-is-element@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz#3b3ed5159a2707c6137b48637fbfe068e175a425"
+  integrity sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==
+
 hast-util-parse-selector@^2.0.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a"
@@ -9595,6 +9641,39 @@ hast-util-raw@6.0.1:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
+hast-util-raw@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.1.0.tgz#e16a3c2642f65cc7c480c165400a40d604ab75d0"
+  integrity sha512-5FoZLDHBpka20OlZZ4I/+RBw5piVQ8iI1doEvffQhx5CbCyTtP8UCq8Tw6NmTAMtXgsQxmhW7Ly8OdFre5/YMQ==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    hast-util-from-parse5 "^6.0.0"
+    hast-util-to-parse5 "^6.0.0"
+    html-void-elements "^1.0.0"
+    parse5 "^6.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+    vfile "^4.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
+hast-util-to-html@^7.1.1:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.3.tgz#9f339ca9bea71246e565fc79ff7dbfe98bb50f5e"
+  integrity sha512-yk2+1p3EJTEE9ZEUkgHsUSVhIpCsL/bvT8E5GzmWc+N1Po5gBw+0F8bo7dpxXR0nu0bQVxVZGX2lBGF21CmeDw==
+  dependencies:
+    ccount "^1.0.0"
+    comma-separated-tokens "^1.0.0"
+    hast-util-is-element "^1.0.0"
+    hast-util-whitespace "^1.0.0"
+    html-void-elements "^1.0.0"
+    property-information "^5.0.0"
+    space-separated-tokens "^1.0.0"
+    stringify-entities "^3.0.1"
+    unist-util-is "^4.0.0"
+    xtend "^4.0.0"
+
 hast-util-to-parse5@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
@@ -9606,6 +9685,16 @@ hast-util-to-parse5@^6.0.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
+hast-util-to-string@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz#9b24c114866bdb9478927d7e9c36a485ac728378"
+  integrity sha512-eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w==
+
+hast-util-whitespace@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz#e4fe77c4a9ae1cb2e6c25e02df0043d0164f6e41"
+  integrity sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==
+
 hastscript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
@@ -11820,6 +11909,11 @@ loglevel@^1.6.8:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
+longest-streak@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
+  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -11934,6 +12028,13 @@ markdown-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
   integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
+markdown-table@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
+  integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
+  dependencies:
+    repeat-string "^1.0.0"
+
 markdown-to-jsx@^6.11.4:
   version "6.11.4"
   resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz#b4528b1ab668aef7fe61c1535c27e837819392c5"
@@ -11984,6 +12085,68 @@ mdast-util-definitions@^4.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
+mdast-util-find-and-replace@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz#b7db1e873f96f66588c321f1363069abf607d1b5"
+  integrity sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==
+  dependencies:
+    escape-string-regexp "^4.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit-parents "^3.0.0"
+
+mdast-util-from-markdown@^0.8.0:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
+  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-string "^2.0.0"
+    micromark "~2.11.0"
+    parse-entities "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+mdast-util-gfm-autolink-literal@^0.1.0:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz#9c4ff399c5ddd2ece40bd3b13e5447d84e385fb7"
+  integrity sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==
+  dependencies:
+    ccount "^1.0.0"
+    mdast-util-find-and-replace "^1.1.0"
+    micromark "^2.11.3"
+
+mdast-util-gfm-strikethrough@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz#45eea337b7fff0755a291844fbea79996c322890"
+  integrity sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+
+mdast-util-gfm-table@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz#af05aeadc8e5ee004eeddfb324b2ad8c029b6ecf"
+  integrity sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==
+  dependencies:
+    markdown-table "^2.0.0"
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm-task-list-item@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz#70c885e6b9f543ddd7e6b41f9703ee55b084af10"
+  integrity sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==
+  dependencies:
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz#8ecddafe57d266540f6881f5c57ff19725bd351c"
+  integrity sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==
+  dependencies:
+    mdast-util-gfm-autolink-literal "^0.1.0"
+    mdast-util-gfm-strikethrough "^0.2.0"
+    mdast-util-gfm-table "^0.1.0"
+    mdast-util-gfm-task-list-item "^0.1.0"
+    mdast-util-to-markdown "^0.6.1"
+
 mdast-util-to-hast@10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
@@ -11998,11 +12161,42 @@ mdast-util-to-hast@10.0.1:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+mdast-util-to-hast@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604"
+  integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    mdast-util-definitions "^4.0.0"
+    mdurl "^1.0.0"
+    unist-builder "^2.0.0"
+    unist-util-generated "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
+mdast-util-to-markdown@^0.6.0, mdast-util-to-markdown@^0.6.1, mdast-util-to-markdown@~0.6.0:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
+  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    longest-streak "^2.0.0"
+    mdast-util-to-string "^2.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.0.0"
+    zwitch "^1.0.0"
+
 mdast-util-to-string@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
+mdast-util-to-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
+  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -12092,6 +12286,59 @@ microevent.ts@~0.1.1:
   resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
   integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
 
+micromark-extension-gfm-autolink-literal@~0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz#53866c1f0c7ef940ae7ca1f72c6faef8fed9f204"
+  integrity sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==
+  dependencies:
+    micromark "~2.11.3"
+
+micromark-extension-gfm-strikethrough@~0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz#96cb83356ff87bf31670eefb7ad7bba73e6514d1"
+  integrity sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-table@~0.4.0:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz#4d49f1ce0ca84996c853880b9446698947f1802b"
+  integrity sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-tagfilter@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz#d9f26a65adee984c9ccdd7e182220493562841ad"
+  integrity sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==
+
+micromark-extension-gfm-task-list-item@~0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz#d90c755f2533ed55a718129cee11257f136283b8"
+  integrity sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm@^0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz#36d1a4c089ca8bdfd978c9bd2bf1a0cb24e2acfe"
+  integrity sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==
+  dependencies:
+    micromark "~2.11.0"
+    micromark-extension-gfm-autolink-literal "~0.5.0"
+    micromark-extension-gfm-strikethrough "~0.6.5"
+    micromark-extension-gfm-table "~0.4.0"
+    micromark-extension-gfm-tagfilter "~0.3.0"
+    micromark-extension-gfm-task-list-item "~0.3.0"
+
+micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3:
+  version "2.11.4"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
+  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
+  dependencies:
+    debug "^4.0.0"
+    parse-entities "^2.0.0"
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -14814,7 +15061,7 @@ react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1, react-is@^17.0.2:
+react-is@^17.0.0, react-is@^17.0.1, react-is@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -14824,6 +15071,25 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
+react-markdown@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-6.0.2.tgz#d89be45c278b1e5f0196f851fffb11e30c69f027"
+  integrity sha512-Et2AjXAsbmPP1nLQQRqmVgcqzfwcz8uQJ8VAdADs8Nk/aaUA0YeU9RDLuCtD+GwajCnm/+Iiu2KPmXzmD/M3vA==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/unist" "^2.0.3"
+    comma-separated-tokens "^1.0.0"
+    prop-types "^15.7.2"
+    property-information "^5.0.0"
+    react-is "^17.0.0"
+    remark-parse "^9.0.0"
+    remark-rehype "^8.0.0"
+    space-separated-tokens "^1.1.0"
+    style-to-object "^0.3.0"
+    unified "^9.0.0"
+    unist-util-visit "^2.0.0"
+    vfile "^4.0.0"
+
 react-popper-tooltip@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac"
@@ -15084,7 +15350,7 @@ reduce-function-call@^1.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-refractor@^3.1.0:
+refractor@^3.1.0, refractor@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.3.1.tgz#ebbc04b427ea81dc25ad333f7f67a0b5f4f0be3a"
   integrity sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==
@@ -15186,6 +15452,37 @@ regjsparser@^0.6.4:
   dependencies:
     jsesc "~0.5.0"
 
+rehype-parse@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-7.0.1.tgz#58900f6702b56767814afc2a9efa2d42b1c90c57"
+  integrity sha512-fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw==
+  dependencies:
+    hast-util-from-parse5 "^6.0.0"
+    parse5 "^6.0.0"
+
+rehype-raw@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-5.1.0.tgz#66d5e8d7188ada2d31bc137bc19a1000cf2c6b7e"
+  integrity sha512-MDvHAb/5mUnif2R+0IPCYJU8WjHa9UzGtM/F4AVy5GixPlDZ1z3HacYy4xojDU+uBa+0X/3PIfyQI26/2ljJNA==
+  dependencies:
+    hast-util-raw "^6.1.0"
+
+rehype-stringify@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-8.0.0.tgz#9b6afb599bcf3165f10f93fc8548f9a03d2ec2ba"
+  integrity sha512-VkIs18G0pj2xklyllrPSvdShAV36Ff3yE5PUO9u36f6+2qJFnn22Z5gKwBOwgXviux4UC7K+/j13AnZfPICi/g==
+  dependencies:
+    hast-util-to-html "^7.1.1"
+
+rehype@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/rehype/-/rehype-11.0.0.tgz#d81729e65f4ac2b26f5de0b6bafc257eb0780e1f"
+  integrity sha512-qXqRqiCFJD5CJ61CSJuNImTFrm3zVkOU9XywHDwrUuvWN74MWt72KJ67c5CM5x8g0vGcOkRVCrYj85vqkmHulQ==
+  dependencies:
+    rehype-parse "^7.0.0"
+    rehype-stringify "^8.0.0"
+    unified "^9.0.0"
+
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -15237,6 +15534,14 @@ remark-footnotes@2.0.0:
   resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
   integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
 
+remark-gfm@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
+  integrity sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==
+  dependencies:
+    mdast-util-gfm "^0.1.0"
+    micromark-extension-gfm "^0.3.0"
+
 remark-mdx@1.6.22:
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd"
@@ -15273,6 +15578,20 @@ remark-parse@8.0.3:
     vfile-location "^3.0.0"
     xtend "^4.0.1"
 
+remark-parse@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
+  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
+  dependencies:
+    mdast-util-from-markdown "^0.8.0"
+
+remark-rehype@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.1.0.tgz#610509a043484c1e697437fa5eb3fd992617c945"
+  integrity sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA==
+  dependencies:
+    mdast-util-to-hast "^10.2.0"
+
 remark-slug@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-6.0.0.tgz#2b54a14a7b50407a5e462ac2f376022cce263e2c"
@@ -15325,7 +15644,7 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
   integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
-repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -16154,7 +16473,7 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
-space-separated-tokens@^1.0.0:
+space-separated-tokens@^1.0.0, space-separated-tokens@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
   integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
@@ -16463,6 +16782,15 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903"
+  integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==
+  dependencies:
+    character-entities-html4 "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    xtend "^4.0.0"
+
 stringify-object@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
@@ -17263,6 +17591,18 @@ unified@9.2.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
+unified@^9.0.0:
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
+  integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^2.0.0"
+    trough "^1.0.0"
+    vfile "^4.0.0"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -17353,7 +17693,7 @@ unist-util-visit-parents@^3.0.0:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
 
-unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
+unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
   integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==

From fff4896bbd146a3e3b938e6843e2a91cd53d0086 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Thu, 3 Jun 2021 23:03:13 +0800
Subject: [PATCH 03/21] feat(react): add md-editor to dataset description
 updates, update graphql for dataset update

---
 .../mappers/DatasetUpdateInputMapper.java     |  4 ++
 .../src/main/resources/gms.graphql            | 41 +++++++++++-
 datahub-web-react/src/app/analytics/event.ts  |  1 +
 .../entity/dataset/profile/DatasetHeader.tsx  | 61 ++++++++++++++---
 .../entity/dataset/profile/DatasetProfile.tsx | 24 ++++++-
 .../profile/modal/UpdateDescriptionModal.tsx  | 63 +++++++++++++++++
 .../entity/dataset/profile/schema/Schema.tsx  | 12 ++--
 .../profile/schema/SchemaDescriptionField.tsx | 67 ++++---------------
 .../src/graphql/fragments.graphql             |  4 ++
 .../dataset/EditableDatasetProperties.pdl     | 17 +++++
 10 files changed, 222 insertions(+), 72 deletions(-)
 create mode 100644 datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
index 53217c3c204edb..39adfc06233f94 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
@@ -36,6 +36,10 @@ public Dataset apply(@Nonnull final DatasetUpdateInput datasetUpdateInput,
             result.setOwnership(OwnershipUpdateMapper.map(datasetUpdateInput.getOwnership(), actor));
         }
 
+        if (datasetUpdateInput.getDescription() != null) {
+            result.setDescription(datasetUpdateInput.getDescription());
+        }
+
         if (datasetUpdateInput.getDeprecation() != null) {
             final DatasetDeprecation deprecation = new DatasetDeprecation();
             deprecation.setDeprecated(datasetUpdateInput.getDeprecation().getDeprecated());
diff --git a/datahub-graphql-core/src/main/resources/gms.graphql b/datahub-graphql-core/src/main/resources/gms.graphql
index c7692e20904280..4e3e7d51403db6 100644
--- a/datahub-graphql-core/src/main/resources/gms.graphql
+++ b/datahub-graphql-core/src/main/resources/gms.graphql
@@ -242,6 +242,11 @@ type Dataset implements EntityWithRelationships & Entity {
     """
     properties: [StringMapEntry!]
 
+    """
+    A list of editable platform-specific metadata tuples
+    """
+    editableProperties: EditableProperties
+
     """
     External URL associated with the Dataset
     """
@@ -620,6 +625,18 @@ type SchemaField {
     glossaryTerms: GlossaryTerms
 }
 
+type EditableProperties {
+    """
+    Description
+    """
+    description: String!
+
+    """
+    Tags
+    """
+    tags: [String!]
+}
+
 type EditableSchemaMetadata {
     editableSchemaFieldInfo: [EditableSchemaFieldInfo!]!
 }
@@ -1413,13 +1430,18 @@ input DatasetUpdateInput {
     """
     The dataset urn
     """
-   urn: String!
+    urn: String!
 
     """
     Update to ownership
     """
     ownership: OwnershipUpdate
 
+    """
+    Update to description
+    """
+    description: String
+
     """
     Update to deprecation status
     """
@@ -1439,6 +1461,11 @@ input DatasetUpdateInput {
     Update to editable schema metadata of the dataset
     """
     editableSchemaMetadata: EditableSchemaMetadataUpdate
+
+    """
+    Update to editable properties
+    """
+    editableProperties: EditablePropertiesUpdate
 }
 
 input EditableSchemaMetadataUpdate {
@@ -1462,6 +1489,18 @@ input EditableSchemaFieldInfoUpdate {
     globalTags: GlobalTagsUpdate
 }
 
+input EditablePropertiesUpdate {
+    """
+    Description
+    """
+    description: String!
+
+    """
+    Tags
+    """
+    tags: [String!]
+}
+
 input GlobalTagsUpdate {
     tags: [TagAssociationUpdate!]
 }
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
index f8e947a1ee1dd5..01acb8fb4a1fb8 100644
--- a/datahub-web-react/src/app/analytics/event.ts
+++ b/datahub-web-react/src/app/analytics/event.ts
@@ -122,6 +122,7 @@ export const EntityActionType = {
     UpdateOwnership: 'UpdateOwnership',
     UpdateDocumentation: 'UpdateDocumentation',
     UpdateDescription: 'UpdateDescription',
+    UpdateProperties: 'UpdateProperties',
     UpdateSchemaDescription: 'UpdateSchemaDescription',
     UpdateSchemaTags: 'UpdateSchemaTags',
     ClickExternalUrl: 'ClickExternalUrl',
diff --git a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
index ec91ab59f6cd76..783df6ea997333 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
@@ -1,34 +1,59 @@
-import { Badge, Divider, Popover, Space, Typography } from 'antd';
-import { ParagraphProps } from 'antd/lib/typography/Paragraph';
-import React from 'react';
+import { Badge, Divider, message, Popover, Space, Tag, Typography } from 'antd';
+import { FetchResult } from '@apollo/client';
+import React, { useState } from 'react';
 import styled from 'styled-components';
-import { Dataset } from '../../../../types.generated';
+import MDEditor from '@uiw/react-md-editor';
+import { MarkdownPreviewProps } from '@uiw/react-markdown-preview';
+import { Dataset, EditableProperties } from '../../../../types.generated';
+import { UpdateDatasetMutation } from '../../../../graphql/dataset.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { AvatarsGroup } from '../../../shared/avatar';
 import CompactContext from '../../../shared/CompactContext';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
+import UpdateDescriptionModal from './modal/UpdateDescriptionModal';
 
-type DescriptionTextProps = ParagraphProps & {
+type DescriptionTextProps = MarkdownPreviewProps & {
     isCompact: boolean;
 };
 
-const DescriptionText = styled(({ isCompact: _, ...props }: DescriptionTextProps) => (
-    <Typography.Paragraph {...props} />
-))`
+const DescriptionText = styled(({ isCompact: _, ...props }: DescriptionTextProps) => <MDEditor.Markdown {...props} />)`
     ${(props) => (props.isCompact ? 'max-width: 377px;' : '')};
     display: block;
     overflow-wrap: break-word;
     word-wrap: break-word;
 `;
 
+const AddNewDescription = styled(Tag)`
+    cursor: pointer;
+`;
+const MessageKey = 'AddDatasetDescription';
+
 export type Props = {
     dataset: Dataset;
+    updateProperties: (
+        update: EditableProperties,
+    ) => Promise<FetchResult<UpdateDatasetMutation, Record<string, any>, Record<string, any>>>;
+    updateDescription: (
+        description: string,
+    ) => Promise<FetchResult<UpdateDatasetMutation, Record<string, any>, Record<string, any>>>;
 };
 
-export default function DatasetHeader({ dataset: { description, ownership, deprecation, platform } }: Props) {
+export default function DatasetHeader({
+    dataset: { description, ownership, deprecation, platform },
+    // updateProperties,
+    updateDescription,
+}: Props) {
     const entityRegistry = useEntityRegistry();
     const isCompact = React.useContext(CompactContext);
     const platformName = capitalizeFirstLetter(platform.name);
+    const [showAddDescModal, setShowAddDescModal] = useState(false);
+
+    const onAddDescription = async (desc: string) => {
+        message.loading({ content: 'Updating...', key: MessageKey });
+        await updateDescription(desc);
+        message.success({ content: 'Updated!', key: MessageKey, duration: 2 });
+        setShowAddDescModal(false);
+    };
 
     return (
         <>
@@ -37,7 +62,23 @@ export default function DatasetHeader({ dataset: { description, ownership, depre
                     <Typography.Text>Dataset</Typography.Text>
                     <Typography.Text strong>{platformName}</Typography.Text>
                 </Space>
-                <DescriptionText isCompact={isCompact}>{description}</DescriptionText>
+                {description ? (
+                    <DescriptionText isCompact={isCompact} source={description} />
+                ) : (
+                    <>
+                        <AddNewDescription color="success" onClick={() => setShowAddDescModal(true)}>
+                            + Add Description
+                        </AddNewDescription>
+                        {showAddDescModal && (
+                            <UpdateDescriptionModal
+                                title="Add description"
+                                onClose={() => setShowAddDescModal(false)}
+                                onSubmit={onAddDescription}
+                                isAddDesc
+                            />
+                        )}
+                    </>
+                )}
                 <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} size="large" />
                 <div>
                     {deprecation?.deprecated && (
diff --git a/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx b/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
index f0a103327db70a..eef728d6000c02 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
@@ -58,7 +58,29 @@ export const DatasetProfile = ({ urn }: { urn: string }): JSX.Element => {
         return <Alert type="error" message={error?.message || `Entity failed to load for urn ${urn}`} />;
     }
 
-    const getHeader = (dataset: Dataset) => <DatasetHeader dataset={dataset} />;
+    const getHeader = (dataset: Dataset) => (
+        <DatasetHeader
+            dataset={dataset}
+            updateProperties={(update) => {
+                analytics.event({
+                    type: EventType.EntityActionEvent,
+                    actionType: EntityActionType.UpdateProperties,
+                    entityType: EntityType.Dataset,
+                    entityUrn: urn,
+                });
+                return updateDataset({ variables: { input: { urn, editableProperties: update } } });
+            }}
+            updateDescription={(description: string) => {
+                analytics.event({
+                    type: EventType.EntityActionEvent,
+                    actionType: EntityActionType.UpdateDescription,
+                    entityType: EntityType.Dataset,
+                    entityUrn: urn,
+                });
+                return updateDataset({ variables: { input: { urn, description } } });
+            }}
+        />
+    );
 
     const getTabs = ({
         ownership,
diff --git a/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx b/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
new file mode 100644
index 00000000000000..118149942199b1
--- /dev/null
+++ b/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
@@ -0,0 +1,63 @@
+import { Typography, Modal, Button, Form } from 'antd';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import MDEditor from '@uiw/react-md-editor';
+
+const DescriptionMarkdown = styled(MDEditor.Markdown)`
+    padding: 4px 10px;
+`;
+
+const FormLabel = styled(Typography.Text)`
+    font-size: 10px;
+    font-weight: bold;
+`;
+
+type Props = {
+    title: string;
+    description?: string | undefined;
+    original?: string | undefined;
+    onClose: () => void;
+    onSubmit: (description: string) => void;
+    isAddDesc?: boolean;
+};
+
+export default function UpdateDescriptionModal({ title, description, original, onClose, onSubmit, isAddDesc }: Props) {
+    const [updatedDesc, setDesc] = useState(description);
+
+    return (
+        <Modal
+            title={title}
+            visible
+            width={900}
+            onCancel={onClose}
+            okButtonProps={{ disabled: !updatedDesc || updatedDesc.length === 0 }}
+            okText={isAddDesc ? 'Submit' : 'Update'}
+            footer={
+                <>
+                    <Button onClick={onClose}>Cancel</Button>
+                    <Button
+                        onClick={() => updatedDesc && onSubmit(updatedDesc)}
+                        disabled={!updatedDesc || updatedDesc.length === 0 || updatedDesc === description}
+                    >
+                        Update
+                    </Button>
+                </>
+            }
+        >
+            <Form layout="vertical">
+                {!isAddDesc && (description || original) && (
+                    <Form.Item label={<FormLabel>Original:</FormLabel>}>
+                        <DescriptionMarkdown source={original || ''} />
+                    </Form.Item>
+                )}
+                {isAddDesc ? (
+                    <MDEditor value={updatedDesc} onChange={(v) => setDesc(v || '')} preview="live" height={400} />
+                ) : (
+                    <Form.Item label={<FormLabel>Updated:</FormLabel>}>
+                        <MDEditor value={updatedDesc} onChange={(v) => setDesc(v || '')} preview="live" height={400} />
+                    </Form.Item>
+                )}
+            </Form>
+        </Modal>
+    );
+}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
index bf871b44263492..7b0a1d5f3baf02 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
@@ -50,7 +50,7 @@ interface ExtendedSchemaFields extends SchemaField {
 
 const defaultColumns = [
     {
-        width: 288,
+        width: 100,
         title: 'Type',
         dataIndex: 'type',
         key: 'type',
@@ -63,7 +63,7 @@ const defaultColumns = [
         title: 'Field',
         dataIndex: 'fieldPath',
         key: 'fieldPath',
-        width: 192,
+        width: 100,
         render: (fieldPath: string) => {
             if (!fieldPath.includes('.')) {
                 return <Typography.Text strong>{fieldPath}</Typography.Text>;
@@ -84,10 +84,10 @@ const defaultColumns = [
                 }
             }
             return (
-                <>
+                <span>
                     <LighterText>{`${firstPath}${lastPath ? '.' : ''}`}</LighterText>
                     {lastPath && <Typography.Text strong>{lastPath}</Typography.Text>}
-                </>
+                </span>
             );
         },
     },
@@ -233,7 +233,7 @@ export default function SchemaView({ urn, schema, editableSchemaMetadata, update
         dataIndex: 'description',
         key: 'description',
         render: descriptionRender,
-        width: 700,
+        width: 300,
         onCell: (record: SchemaField, rowIndex: number | undefined) => ({
             onMouseEnter: () => {
                 setDescHoveredIndex(`${record.fieldPath}-${rowIndex}`);
@@ -245,7 +245,7 @@ export default function SchemaView({ urn, schema, editableSchemaMetadata, update
     };
 
     const tagAndTermColumn = {
-        width: 400,
+        width: 150,
         title: 'Tags & Terms',
         dataIndex: 'globalTags',
         key: 'tag',
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
index ccb72e6c602413..aa79eb9cc8fc69 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
@@ -1,12 +1,12 @@
-import { Typography, Modal, Button, Input, Form, message } from 'antd';
+import { Typography, message } from 'antd';
 import { EditOutlined } from '@ant-design/icons';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 import { FetchResult } from '@apollo/client';
+import MDEditor from '@uiw/react-md-editor';
 
 import { UpdateDatasetMutation } from '../../../../../graphql/dataset.generated';
-
-const { TextArea } = Input;
+import UpdateDescriptionModal from '../modal/UpdateDescriptionModal';
 
 const DescriptionContainer = styled.div`
     position: relative;
@@ -14,7 +14,7 @@ const DescriptionContainer = styled.div`
     flex-direction: row;
 `;
 
-const DescriptionText = styled(Typography.Text)`
+const DescriptionText = styled(MDEditor.Markdown)`
     padding-right: 8px;
     max-width: 600px;
     display: block;
@@ -22,15 +22,6 @@ const DescriptionText = styled(Typography.Text)`
     word-wrap: break-word;
 `;
 
-const DescriptionTextInModal = styled(Typography.Text)`
-    padding: 4px 10px;
-`;
-
-const FormLabel = styled(Typography.Text)`
-    font-size: 10px;
-    font-weight: bold;
-`;
-
 const EditIcon = styled(EditOutlined)`
     cursor: pointer;
     margin-top: 4px;
@@ -55,20 +46,19 @@ type Props = {
 
 export default function DescriptionField({ description, updatedDescription, onHover, onUpdate }: Props) {
     const [showAddModal, setShowAddModal] = useState(false);
-    const [updatedDesc, setDesc] = useState(updatedDescription || description);
 
     const onCloseModal = () => setShowAddModal(false);
 
-    const onUpdateModal = async () => {
+    const onUpdateModal = async (desc: string) => {
         message.loading({ content: 'Updating...', key: MessageKey });
-        await onUpdate(updatedDesc);
+        await onUpdate(desc);
         message.success({ content: 'Updated!', key: MessageKey, duration: 2 });
         onCloseModal();
     };
 
     return (
         <DescriptionContainer>
-            <DescriptionText>{updatedDescription || description}</DescriptionText>
+            <DescriptionText source={updatedDescription || description} />
             {onHover && (
                 <EditIcon
                     twoToneColor="#52c41a"
@@ -87,44 +77,13 @@ export default function DescriptionField({ description, updatedDescription, onHo
                     }}
                     aria-hidden="true"
                 >
-                    <Modal
+                    <UpdateDescriptionModal
                         title="Update description"
-                        visible
-                        onCancel={onCloseModal}
-                        okButtonProps={{ disabled: !updatedDesc || updatedDesc.length === 0 }}
-                        okText="Update"
-                        footer={
-                            <>
-                                <Button onClick={onCloseModal}>Cancel</Button>
-                                <Button
-                                    onClick={onUpdateModal}
-                                    disabled={
-                                        !updatedDesc ||
-                                        updatedDesc.length === 0 ||
-                                        updatedDesc === (updatedDescription || description)
-                                    }
-                                >
-                                    Update
-                                </Button>
-                            </>
-                        }
-                    >
-                        <Form layout="vertical">
-                            {(updatedDescription || description) && (
-                                <Form.Item label={<FormLabel>Original:</FormLabel>}>
-                                    <DescriptionTextInModal>{description}</DescriptionTextInModal>
-                                </Form.Item>
-                            )}
-                            <Form.Item label={<FormLabel>Updated:</FormLabel>}>
-                                <TextArea
-                                    value={updatedDesc}
-                                    onChange={(e) => setDesc(e.target.value)}
-                                    placeholder="Description"
-                                    autoSize={{ minRows: 2, maxRows: 6 }}
-                                />
-                            </Form.Item>
-                        </Form>
-                    </Modal>
+                        description={updatedDescription || description}
+                        original={description}
+                        onClose={onCloseModal}
+                        onSubmit={onUpdateModal}
+                    />
                 </div>
             )}
             {updatedDescription && <EditedLabel>(edited)</EditedLabel>}
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index 48c21285951d15..0f84dd4617b5d0 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -110,6 +110,10 @@ fragment nonRecursiveDatasetFields on Dataset {
         key
         value
     }
+    editableProperties {
+        description
+        tags
+    }
     ownership {
         ...ownershipFields
     }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
new file mode 100644
index 00000000000000..882964b012adba
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
@@ -0,0 +1,17 @@
+namespace com.linkedin.dataset
+
+/**
+ * Properties associated with a Dataset
+ */
+record EditableDatasetProperties {
+
+  /**
+   * Documentation of the dataset
+   */
+  description: optional string
+
+  /**
+   * [Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.
+   */
+  tags: array[string] = [ ]
+}
\ No newline at end of file

From 85f5df43c2a5dd6d82b863390ff68c399f574266 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Fri, 4 Jun 2021 01:27:23 +0800
Subject: [PATCH 04/21] feat(react): update with collapsible markdown viewer,
 styling, update dataset schema ui/ux

---
 .../entity/dataset/profile/DatasetHeader.tsx  | 12 +---
 .../profile/schema/SchemaDescriptionField.tsx | 50 ++++++--------
 .../src/app/entity/shared/MarkdownViewer.tsx  | 66 +++++++++++++++++++
 3 files changed, 89 insertions(+), 39 deletions(-)
 create mode 100644 datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx

diff --git a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
index 783df6ea997333..21f3b52b363329 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
@@ -2,8 +2,6 @@ import { Badge, Divider, message, Popover, Space, Tag, Typography } from 'antd';
 import { FetchResult } from '@apollo/client';
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import MDEditor from '@uiw/react-md-editor';
-import { MarkdownPreviewProps } from '@uiw/react-markdown-preview';
 import { Dataset, EditableProperties } from '../../../../types.generated';
 import { UpdateDatasetMutation } from '../../../../graphql/dataset.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
@@ -11,16 +9,10 @@ import { AvatarsGroup } from '../../../shared/avatar';
 import CompactContext from '../../../shared/CompactContext';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
 import UpdateDescriptionModal from './modal/UpdateDescriptionModal';
+import MarkdownViewer from '../../shared/MarkdownViewer';
 
-type DescriptionTextProps = MarkdownPreviewProps & {
-    isCompact: boolean;
-};
-
-const DescriptionText = styled(({ isCompact: _, ...props }: DescriptionTextProps) => <MDEditor.Markdown {...props} />)`
+const DescriptionText = styled(MarkdownViewer)`
     ${(props) => (props.isCompact ? 'max-width: 377px;' : '')};
-    display: block;
-    overflow-wrap: break-word;
-    word-wrap: break-word;
 `;
 
 const AddNewDescription = styled(Tag)`
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
index aa79eb9cc8fc69..18e116b0a8cc08 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
@@ -3,33 +3,33 @@ import { EditOutlined } from '@ant-design/icons';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 import { FetchResult } from '@apollo/client';
-import MDEditor from '@uiw/react-md-editor';
 
 import { UpdateDatasetMutation } from '../../../../../graphql/dataset.generated';
 import UpdateDescriptionModal from '../modal/UpdateDescriptionModal';
+import MarkdownViewer from '../../../shared/MarkdownViewer';
 
-const DescriptionContainer = styled.div`
+const DescriptionContainer = styled.div<{ hover?: string }>`
     position: relative;
     display: flex;
     flex-direction: row;
+    ${(props) => (props.hover ? '' : 'padding-right: 19px;')}
 `;
 
-const DescriptionText = styled(MDEditor.Markdown)`
+const DescriptionText = styled(MarkdownViewer)`
     padding-right: 8px;
-    max-width: 600px;
-    display: block;
-    overflow-wrap: break-word;
-    word-wrap: break-word;
 `;
 
 const EditIcon = styled(EditOutlined)`
     cursor: pointer;
-    margin-top: 4px;
+    margin-top: 5px;
+    margin-left: 5px;
 `;
 
 const EditedLabel = styled(Typography.Text)`
-    padding-left: 8px;
-    color: rgb(150, 150, 150);
+    position: absolute;
+    right: -10px;
+    top: -15px;
+    color: rgba(150, 150, 150, 0.5);
     font-style: italic;
 `;
 
@@ -57,26 +57,19 @@ export default function DescriptionField({ description, updatedDescription, onHo
     };
 
     return (
-        <DescriptionContainer>
+        <DescriptionContainer
+            onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+            }}
+            aria-hidden="true"
+            hover={onHover ? 'true' : undefined}
+        >
             <DescriptionText source={updatedDescription || description} />
-            {onHover && (
-                <EditIcon
-                    twoToneColor="#52c41a"
-                    onClick={(e) => {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        setShowAddModal(true);
-                    }}
-                />
-            )}
+            {onHover && <EditIcon twoToneColor="#52c41a" onClick={() => setShowAddModal(true)} />}
+            {updatedDescription && <EditedLabel>(edited)</EditedLabel>}
             {showAddModal && (
-                <div
-                    onClick={(e) => {
-                        e.preventDefault();
-                        e.stopPropagation();
-                    }}
-                    aria-hidden="true"
-                >
+                <div>
                     <UpdateDescriptionModal
                         title="Update description"
                         description={updatedDescription || description}
@@ -86,7 +79,6 @@ export default function DescriptionField({ description, updatedDescription, onHo
                     />
                 </div>
             )}
-            {updatedDescription && <EditedLabel>(edited)</EditedLabel>}
         </DescriptionContainer>
     );
 }
diff --git a/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx b/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
new file mode 100644
index 00000000000000..f0bf0283eee21d
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
@@ -0,0 +1,66 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { Button, Typography } from 'antd';
+import MDEditor from '@uiw/react-md-editor';
+import { MarkdownPreviewProps } from '@uiw/react-markdown-preview';
+import styled from 'styled-components';
+
+const { Text } = Typography;
+
+const MarkdownContainer = styled.div<{ showall?: string }>`
+    max-width: 100%;
+    max-width: 900px;
+`;
+
+type MarkdownViewProps = MarkdownPreviewProps & {
+    showall?: string;
+};
+
+const MarkdownView = styled(({ showall: _, ...props }: MarkdownViewProps) => <MDEditor.Markdown {...props} />)`
+    display: block;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    ${(props) =>
+        props.showall
+            ? ''
+            : `
+        max-height: 150px;
+        margin-bottom: 15px;
+        `}
+    overflow-x: hidden;
+    overflow-y: auto;
+`;
+
+export type Props = {
+    source: string;
+    limit?: number;
+    isCompact?: boolean;
+};
+
+export default function MarkdownViewer({ source, limit = 150 }: Props) {
+    const [height, setHeight] = useState(0);
+    const [showAll, setShowAll] = useState(false);
+    const ref = useRef(null);
+    const isOverLimit = height >= limit;
+
+    useEffect(() => {
+        if (ref && ref.current) {
+            setHeight((ref.current as any).clientHeight);
+        }
+    }, []);
+
+    return (
+        <MarkdownContainer ref={ref}>
+            <MarkdownView source={source} showall={isOverLimit && showAll ? 'true' : undefined} />
+            {isOverLimit && (
+                <>
+                    {!showAll && <Text>...</Text>}
+                    <Button type="link" onClick={() => setShowAll(!showAll)}>
+                        <Text italic type="secondary">
+                            {showAll ? 'Show less' : 'show more'}
+                        </Text>
+                    </Button>
+                </>
+            )}
+        </MarkdownContainer>
+    );
+}

From fbcf44776227192a6d3835999f7f63fda438dd8e Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Fri, 4 Jun 2021 02:16:00 +0800
Subject: [PATCH 05/21] feat(react): fix tests for schema, dataset

---
 datahub-web-react/src/Mocks.tsx                                | 3 +++
 .../entity/dataset/profile/schema/SchemaDescriptionField.tsx   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index 2f42d473e18508..9b5bd0c77ba21a 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -101,6 +101,7 @@ const dataset1 = {
             value: 'My other property value.',
         },
     ],
+    editableProperties: null,
     created: {
         time: 0,
     },
@@ -160,6 +161,7 @@ const dataset2 = {
     description: 'This is some other dataset, so who cares!',
     uri: 'www.google.com',
     properties: [],
+    editableProperties: null,
     created: {
         time: 0,
     },
@@ -208,6 +210,7 @@ export const dataset3 = {
     description: 'This and here we have yet another Dataset (YAN). Are there more?',
     uri: 'www.google.com',
     properties: [],
+    editableProperties: null,
     created: {
         time: 0,
     },
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
index 18e116b0a8cc08..6c9c1cc23f9707 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
@@ -62,7 +62,6 @@ export default function DescriptionField({ description, updatedDescription, onHo
                 e.preventDefault();
                 e.stopPropagation();
             }}
-            aria-hidden="true"
             hover={onHover ? 'true' : undefined}
         >
             <DescriptionText source={updatedDescription || description} />

From 44fd97d45b8af0ae5573b4b9b4d605ff5ac2b429 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Wed, 9 Jun 2021 22:06:08 +0800
Subject: [PATCH 06/21] feat(gms): add editdatasetproperties aspect into
 dataset, updatedataset graphql mutation, update ingestion

---
 .../graphql/types/dataset/DatasetType.java    |   7 +
 .../mappers/DatasetSnapshotMapper.java        |  10 +-
 .../mappers/DatasetUpdateInputMapper.java     |  15 +-
 .../src/main/resources/gms.graphql            |   5 -
 .../pegasus/com/linkedin/dataset/Dataset.pdl  |   5 +
 .../com.linkedin.chart.charts.snapshot.json   |  14 +-
 ...inkedin.dashboard.dashboards.snapshot.json |  15 +-
 ....linkedin.dataflow.dataFlows.snapshot.json |  24 +--
 ...om.linkedin.datajob.dataJobs.snapshot.json |  28 +--
 ...in.dataprocess.dataProcesses.snapshot.json |  18 +-
 ...om.linkedin.dataset.datasets.snapshot.json |  64 ++++---
 ...com.linkedin.entity.entities.snapshot.json | 173 +++++++++---------
 ...kedin.glossary.glossaryNodes.snapshot.json |   9 +-
 ...kedin.glossary.glossaryTerms.snapshot.json |  11 +-
 ...linkedin.identity.corpGroups.snapshot.json |   3 +-
 ....linkedin.identity.corpUsers.snapshot.json |  14 +-
 .../com.linkedin.ml.mlModels.snapshot.json    |  18 +-
 .../com.linkedin.tag.tags.snapshot.json       |   6 +-
 .../com/linkedin/dataset/client/Datasets.java |   3 +
 .../metadata/resources/dataset/Datasets.java  |   6 +
 .../examples/mce_files/bootstrap_mce.json     |   8 +
 .../linkedin/pegasus2avro/dataset/__init__.py |   2 +
 .../src/datahub/metadata/schema.avsc          |  48 +++++
 .../src/datahub/metadata/schema_classes.py    | 106 ++++++++++-
 .../dataset/EditableDatasetProperties.pdl     |  11 +-
 .../metadata/aspect/DatasetAspect.pdl         |   2 +
 26 files changed, 415 insertions(+), 210 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
index a5820239c26269..51bc30635b761a 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
@@ -177,6 +177,13 @@ public Dataset update(@Nonnull DatasetUpdateInput input, @Nonnull QueryContext c
             }
         }
 
+        if (partialDataset.hasEditableProperties()) {
+            partialDataset.getEditableProperties().setLastModified(auditStamp);
+            if (!partialDataset.getEditableProperties().hasCreated()) {
+                partialDataset.getEditableProperties().setCreated(auditStamp);
+            }
+        }
+
         partialDataset.setLastModified(auditStamp);
 
         try {
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
index de4d977d3a9bc0..c50456baf04086 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
@@ -9,6 +9,7 @@
 import com.linkedin.datahub.graphql.generated.Dataset;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.FabricType;
+import com.linkedin.datahub.graphql.generated.EditableProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.InstitutionalMemoryMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
@@ -17,6 +18,7 @@
 import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
 import com.linkedin.dataset.DatasetDeprecation;
 import com.linkedin.dataset.DatasetProperties;
+import com.linkedin.dataset.EditableDatasetProperties;
 import com.linkedin.metadata.dao.utils.ModelUtils;
 import com.linkedin.metadata.snapshot.DatasetSnapshot;
 import com.linkedin.schema.EditableSchemaMetadata;
@@ -51,6 +53,7 @@ public Dataset apply(@Nonnull final DatasetSnapshot dataset) {
         result.setPlatform(partialPlatform);
 
         ModelUtils.getAspectsFromSnapshot(dataset).forEach(aspect -> {
+            result.setTags(new ArrayList<>());
             if (aspect instanceof DatasetProperties) {
                 final DatasetProperties datasetProperties = (DatasetProperties) aspect;
                 result.setProperties(StringMapMapper.map(datasetProperties.getCustomProperties()));
@@ -79,8 +82,13 @@ public Dataset apply(@Nonnull final DatasetSnapshot dataset) {
               result.setGlobalTags(GlobalTagsMapper.map((GlobalTags) aspect));
             } else if (aspect instanceof EditableSchemaMetadata) {
               result.setEditableSchemaMetadata(EditableSchemaMetadataMapper.map((EditableSchemaMetadata) aspect));
+            } else if (aspect instanceof EditableDatasetProperties) {
+                final EditableDatasetProperties editableDatasetProperties = (EditableDatasetProperties) aspect;
+                final EditableProperties editableProperties = new EditableProperties();
+                editableProperties.setDescription(editableDatasetProperties.getDescription());
+                editableProperties.setTags(editableDatasetProperties.getTags());
+                result.setEditableProperties(editableProperties);
             }
-            result.setTags(new ArrayList<>());
         });
 
         return result;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
index 39adfc06233f94..ef7968205b1a89 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
@@ -5,6 +5,7 @@
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.StringArray;
 import com.linkedin.datahub.graphql.generated.DatasetUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.InstitutionalMemoryUpdateMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
@@ -12,6 +13,7 @@
 import com.linkedin.datahub.graphql.types.tag.mappers.TagAssociationUpdateMapper;
 import com.linkedin.dataset.Dataset;
 import com.linkedin.dataset.DatasetDeprecation;
+import com.linkedin.dataset.EditableDatasetProperties;
 import com.linkedin.schema.EditableSchemaFieldInfo;
 import com.linkedin.schema.EditableSchemaFieldInfoArray;
 import com.linkedin.schema.EditableSchemaMetadata;
@@ -36,10 +38,6 @@ public Dataset apply(@Nonnull final DatasetUpdateInput datasetUpdateInput,
             result.setOwnership(OwnershipUpdateMapper.map(datasetUpdateInput.getOwnership(), actor));
         }
 
-        if (datasetUpdateInput.getDescription() != null) {
-            result.setDescription(datasetUpdateInput.getDescription());
-        }
-
         if (datasetUpdateInput.getDeprecation() != null) {
             final DatasetDeprecation deprecation = new DatasetDeprecation();
             deprecation.setDeprecated(datasetUpdateInput.getDeprecation().getDeprecated());
@@ -78,6 +76,15 @@ public Dataset apply(@Nonnull final DatasetUpdateInput datasetUpdateInput,
 
         }
 
+        if (datasetUpdateInput.getEditableProperties() != null) {
+            final EditableDatasetProperties editableDatasetProperties = new EditableDatasetProperties();
+            editableDatasetProperties.setDescription(datasetUpdateInput.getEditableProperties().getDescription());
+            if (datasetUpdateInput.getEditableProperties().getTags() != null) {
+                editableDatasetProperties.setTags(new StringArray(datasetUpdateInput.getEditableProperties().getTags()));
+            }
+            result.setEditableProperties(editableDatasetProperties);
+        }
+
         return result;
     }
 
diff --git a/datahub-graphql-core/src/main/resources/gms.graphql b/datahub-graphql-core/src/main/resources/gms.graphql
index db73b391181f09..fbf650480676ee 100644
--- a/datahub-graphql-core/src/main/resources/gms.graphql
+++ b/datahub-graphql-core/src/main/resources/gms.graphql
@@ -1437,11 +1437,6 @@ input DatasetUpdateInput {
     """
     ownership: OwnershipUpdate
 
-    """
-    Update to description
-    """
-    description: String
-
     """
     Update to deprecation status
     """
diff --git a/gms/api/src/main/pegasus/com/linkedin/dataset/Dataset.pdl b/gms/api/src/main/pegasus/com/linkedin/dataset/Dataset.pdl
index 048fce91b7977d..c4ce896ec50ba4 100644
--- a/gms/api/src/main/pegasus/com/linkedin/dataset/Dataset.pdl
+++ b/gms/api/src/main/pegasus/com/linkedin/dataset/Dataset.pdl
@@ -79,6 +79,11 @@ record Dataset includes DatasetKey, ChangeAuditStamps, VersionTag {
    */
   properties: optional map[string, string]
 
+  /**
+   * Editable properties
+   */
+  editableProperties: optional EditableDatasetProperties
+
   /**
    * whether the dataset is removed or not
    */
diff --git a/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
index 5f67b4a0b0349b..0543e176f8867e 100644
--- a/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
@@ -85,15 +85,14 @@
       "type" : "string",
       "doc" : "Title of the chart",
       "Searchable" : {
+        "enableAutocomplete" : true,
         "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
       "type" : "string",
       "doc" : "Detailed description about the chart",
-      "Searchable" : {
-        "fieldType" : "TEXT"
-      }
+      "Searchable" : { }
     }, {
       "name" : "lastModified",
       "type" : {
@@ -340,8 +339,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -367,7 +365,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -536,8 +535,7 @@
           "addToFilters" : true,
           "boostScore" : 4.0,
           "fieldName" : "tool",
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "chartId",
diff --git a/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
index f50d1a641be194..0f95ed3813bb15 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
@@ -227,8 +227,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -254,7 +253,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -393,8 +393,7 @@
           "Searchable" : {
             "boostScore" : 10.0,
             "enableAutocomplete" : true,
-            "fieldType" : "TEXT_PARTIAL",
-            "queryByDefault" : true
+            "fieldType" : "TEXT_PARTIAL"
           }
         }, {
           "name" : "description",
@@ -402,8 +401,7 @@
           "doc" : "Detailed description about the dashboard",
           "Searchable" : {
             "fieldType" : "TEXT",
-            "hasValuesFieldName" : "hasDescription",
-            "queryByDefault" : true
+            "hasValuesFieldName" : "hasDescription"
           }
         }, {
           "name" : "charts",
@@ -483,8 +481,7 @@
           "addToFilters" : true,
           "boostScore" : 4.0,
           "fieldName" : "tool",
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "dashboardId",
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
index 083e23df744f68..7c11c6043e919a 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
@@ -189,8 +189,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -216,7 +215,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -365,8 +365,7 @@
           "Searchable" : {
             "boostScore" : 10.0,
             "enableAutocomplete" : true,
-            "fieldType" : "TEXT_PARTIAL",
-            "queryByDefault" : true
+            "fieldType" : "TEXT_PARTIAL"
           }
         }, {
           "name" : "description",
@@ -375,8 +374,7 @@
           "optional" : true,
           "Searchable" : {
             "fieldType" : "TEXT",
-            "hasValuesFieldName" : "hasDescription",
-            "queryByDefault" : true
+            "hasValuesFieldName" : "hasDescription"
           }
         }, {
           "name" : "project",
@@ -384,7 +382,8 @@
           "doc" : "Optional project/namespace associated with the flow",
           "optional" : true,
           "Searchable" : {
-            "fieldType" : "TEXT_PARTIAL"
+            "fieldType" : "TEXT_PARTIAL",
+            "queryByDefault" : false
           }
         } ],
         "Aspect" : {
@@ -424,8 +423,7 @@
         "type" : "string",
         "doc" : "Workflow manager like azkaban, airflow which orchestrates the flow",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "flowId",
@@ -433,16 +431,14 @@
         "doc" : "Unique Identifier of the data flow",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "cluster",
         "type" : "string",
         "doc" : "Cluster where the flow is executed",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
index a22eb5258bb0f2..4dda76d5d48b6d 100644
--- a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
@@ -257,8 +257,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -284,7 +283,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -420,8 +420,7 @@
           "Searchable" : {
             "boostScore" : 10.0,
             "enableAutocomplete" : true,
-            "fieldType" : "TEXT_PARTIAL",
-            "queryByDefault" : true
+            "fieldType" : "TEXT_PARTIAL"
           }
         }, {
           "name" : "description",
@@ -430,8 +429,7 @@
           "optional" : true,
           "Searchable" : {
             "fieldType" : "TEXT",
-            "hasValuesFieldName" : "hasDescription",
-            "queryByDefault" : true
+            "hasValuesFieldName" : "hasDescription"
           }
         }, {
           "name" : "type",
@@ -495,7 +493,8 @@
             "/*" : {
               "fieldName" : "inputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numInputDatasets"
+              "numValuesFieldName" : "numInputDatasets",
+              "queryByDefault" : false
             }
           }
         }, {
@@ -515,7 +514,8 @@
             "/*" : {
               "fieldName" : "outputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numOutputDatasets"
+              "numValuesFieldName" : "numOutputDatasets",
+              "queryByDefault" : false
             }
           }
         }, {
@@ -564,9 +564,14 @@
         "name" : "flow",
         "type" : "com.linkedin.common.Urn",
         "doc" : "Standardized data processing flow urn representing the flow for the job",
+        "Relationship" : {
+          "entityTypes" : [ "dataFlow" ],
+          "name" : "IsPartOf"
+        },
         "Searchable" : {
           "fieldName" : "dataFlow",
-          "fieldType" : "URN_PARTIAL"
+          "fieldType" : "URN_PARTIAL",
+          "queryByDefault" : false
         }
       }, {
         "name" : "jobId",
@@ -574,8 +579,7 @@
         "doc" : "Unique Identifier of the data job",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json
index cdd85cc29da51a..7ab48587b8fa9b 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataprocess.dataProcesses.snapshot.json
@@ -131,7 +131,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -280,7 +281,8 @@
             "/*" : {
               "fieldName" : "inputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numInputDatasets"
+              "numValuesFieldName" : "numInputDatasets",
+              "queryByDefault" : false
             }
           }
         }, {
@@ -301,7 +303,8 @@
             "/*" : {
               "fieldName" : "outputs",
               "fieldType" : "URN",
-              "numValuesFieldName" : "numOutputDatasets"
+              "numValuesFieldName" : "numOutputDatasets",
+              "queryByDefault" : false
             }
           }
         } ],
@@ -329,8 +332,7 @@
         "Searchable" : {
           "boostScore" : 4.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "orchestrator",
@@ -338,15 +340,15 @@
         "doc" : "Standardized Orchestrator where data process is defined.\nTODO: Migrate towards something that can be validated like DataPlatform urn",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "origin",
         "type" : "com.linkedin.common.FabricType",
         "doc" : "Fabric type where dataset belongs to or where it was generated.",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL"
+          "fieldType" : "TEXT_PARTIAL",
+          "queryByDefault" : false
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
index 83d1ec3e4f2680..1a61a3bc998b5d 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
@@ -293,8 +293,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -409,7 +408,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -600,6 +600,33 @@
       },
       "doc" : "A key-value map of platform-specific properties",
       "optional" : true
+    }, {
+      "name" : "editableProperties",
+      "type" : {
+        "type" : "record",
+        "name" : "EditableDatasetProperties",
+        "doc" : "EditableDatasetProperties stores editable changes made to dataset properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+        "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+        "fields" : [ {
+          "name" : "description",
+          "type" : "string",
+          "doc" : "Documentation of the dataset",
+          "optional" : true
+        }, {
+          "name" : "tags",
+          "type" : {
+            "type" : "array",
+            "items" : "string"
+          },
+          "doc" : "[Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.",
+          "default" : [ ]
+        } ],
+        "Aspect" : {
+          "name" : "editableDatasetProperties"
+        }
+      },
+      "doc" : "Editable properties",
+      "optional" : true
     }, {
       "name" : "removed",
       "type" : "boolean",
@@ -816,8 +843,7 @@
                 "doc" : "Flattened name of the field. Field is computed from jsonPath field. For data translation rules refer to wiki page above.",
                 "Searchable" : {
                   "fieldName" : "fieldPaths",
-                  "fieldType" : "TEXT_PARTIAL",
-                  "queryByDefault" : true
+                  "fieldType" : "TEXT_PARTIAL"
                 }
               }, {
                 "name" : "jsonPath",
@@ -837,8 +863,7 @@
                 "Searchable" : {
                   "boostScore" : 0.1,
                   "fieldName" : "fieldDescriptions",
-                  "fieldType" : "TEXT",
-                  "queryByDefault" : true
+                  "fieldType" : "TEXT"
                 }
               }, {
                 "name" : "type",
@@ -962,8 +987,7 @@
                   "/tags/*/tag" : {
                     "boostScore" : 0.5,
                     "fieldName" : "fieldTags",
-                    "fieldType" : "URN_PARTIAL",
-                    "queryByDefault" : true
+                    "fieldType" : "URN_PARTIAL"
                   }
                 }
               }, {
@@ -1064,8 +1088,7 @@
                 "Searchable" : {
                   "boostScore" : 0.1,
                   "fieldName" : "editedFieldDescriptions",
-                  "fieldType" : "TEXT",
-                  "queryByDefault" : true
+                  "fieldType" : "TEXT"
                 }
               }, {
                 "name" : "globalTags",
@@ -1076,8 +1099,7 @@
                   "/tags/*/tag" : {
                     "boostScore" : 0.5,
                     "fieldName" : "editedFieldTags",
-                    "fieldType" : "URN_PARTIAL",
-                    "queryByDefault" : true
+                    "fieldType" : "URN_PARTIAL"
                   }
                 }
               } ]
@@ -1124,7 +1146,8 @@
                 },
                 "Searchable" : {
                   "fieldName" : "upstreams",
-                  "fieldType" : "URN"
+                  "fieldType" : "URN",
+                  "queryByDefault" : false
                 }
               }, {
                 "name" : "type",
@@ -1203,8 +1226,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "uri",
@@ -1270,7 +1292,7 @@
       },
       "doc" : "List of downstream dataset lineage information"
     } ]
-  }, "com.linkedin.dataset.PlatformNativeType", "com.linkedin.dataset.SchemaFieldPath", "com.linkedin.dataset.Upstream", "com.linkedin.dataset.UpstreamLineage", {
+  }, "com.linkedin.dataset.EditableDatasetProperties", "com.linkedin.dataset.PlatformNativeType", "com.linkedin.dataset.SchemaFieldPath", "com.linkedin.dataset.Upstream", "com.linkedin.dataset.UpstreamLineage", {
     "type" : "record",
     "name" : "UpstreamLineageDelta",
     "namespace" : "com.linkedin.dataset",
@@ -1308,8 +1330,7 @@
         "Searchable" : {
           "boostScore" : 10.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "origin",
@@ -1317,13 +1338,14 @@
         "doc" : "Fabric type where dataset belongs to or where it was generated.",
         "Searchable" : {
           "addToFilters" : true,
-          "fieldType" : "TEXT_PARTIAL"
+          "fieldType" : "TEXT_PARTIAL",
+          "queryByDefault" : false
         }
       } ],
       "Aspect" : {
         "name" : "datasetKey"
       }
-    }, "com.linkedin.dataset.DatasetProperties", "com.linkedin.dataset.DatasetDeprecation", "com.linkedin.dataset.DatasetUpstreamLineage", "com.linkedin.dataset.UpstreamLineage", "com.linkedin.common.InstitutionalMemory", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.schema.SchemaMetadata", "com.linkedin.schema.EditableSchemaMetadata", "com.linkedin.common.GlobalTags", "com.linkedin.common.GlossaryTerms", "com.linkedin.common.BrowsePaths" ]
+    }, "com.linkedin.dataset.DatasetProperties", "com.linkedin.dataset.EditableDatasetProperties", "com.linkedin.dataset.DatasetDeprecation", "com.linkedin.dataset.DatasetUpstreamLineage", "com.linkedin.dataset.UpstreamLineage", "com.linkedin.common.InstitutionalMemory", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.schema.SchemaMetadata", "com.linkedin.schema.EditableSchemaMetadata", "com.linkedin.common.GlobalTags", "com.linkedin.common.GlossaryTerms", "com.linkedin.common.BrowsePaths" ]
   }, "com.linkedin.metadata.key.DatasetKey", {
     "type" : "record",
     "name" : "AggregationMetadata",
diff --git a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index ef2a43a9d8f0fe..ab0b6d4936d19f 100644
--- a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -85,15 +85,14 @@
       "type" : "string",
       "doc" : "Title of the chart",
       "Searchable" : {
+        "enableAutocomplete" : true,
         "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
       "type" : "string",
       "doc" : "Detailed description about the chart",
-      "Searchable" : {
-        "fieldType" : "TEXT"
-      }
+      "Searchable" : { }
     }, {
       "name" : "lastModified",
       "type" : {
@@ -712,8 +711,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -945,7 +943,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -1066,8 +1065,7 @@
       "Searchable" : {
         "boostScore" : 10.0,
         "enableAutocomplete" : true,
-        "fieldType" : "TEXT_PARTIAL",
-        "queryByDefault" : true
+        "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
@@ -1075,8 +1073,7 @@
       "doc" : "Detailed description about the dashboard",
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "charts",
@@ -1132,8 +1129,7 @@
       "Searchable" : {
         "boostScore" : 10.0,
         "enableAutocomplete" : true,
-        "fieldType" : "TEXT_PARTIAL",
-        "queryByDefault" : true
+        "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
@@ -1142,8 +1138,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "project",
@@ -1151,7 +1146,8 @@
       "doc" : "Optional project/namespace associated with the flow",
       "optional" : true,
       "Searchable" : {
-        "fieldType" : "TEXT_PARTIAL"
+        "fieldType" : "TEXT_PARTIAL",
+        "queryByDefault" : false
       }
     } ],
     "Aspect" : {
@@ -1170,8 +1166,7 @@
       "Searchable" : {
         "boostScore" : 10.0,
         "enableAutocomplete" : true,
-        "fieldType" : "TEXT_PARTIAL",
-        "queryByDefault" : true
+        "fieldType" : "TEXT_PARTIAL"
       }
     }, {
       "name" : "description",
@@ -1180,8 +1175,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "type",
@@ -1236,7 +1230,8 @@
         "/*" : {
           "fieldName" : "inputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numInputDatasets"
+          "numValuesFieldName" : "numInputDatasets",
+          "queryByDefault" : false
         }
       }
     }, {
@@ -1256,7 +1251,8 @@
         "/*" : {
           "fieldName" : "outputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numOutputDatasets"
+          "numValuesFieldName" : "numOutputDatasets",
+          "queryByDefault" : false
         }
       }
     }, {
@@ -1352,7 +1348,8 @@
         "/*" : {
           "fieldName" : "inputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numInputDatasets"
+          "numValuesFieldName" : "numInputDatasets",
+          "queryByDefault" : false
         }
       }
     }, {
@@ -1373,7 +1370,8 @@
         "/*" : {
           "fieldName" : "outputs",
           "fieldType" : "URN",
-          "numValuesFieldName" : "numOutputDatasets"
+          "numValuesFieldName" : "numOutputDatasets",
+          "queryByDefault" : false
         }
       }
     } ],
@@ -1460,8 +1458,7 @@
       "optional" : true,
       "Searchable" : {
         "fieldType" : "TEXT",
-        "hasValuesFieldName" : "hasDescription",
-        "queryByDefault" : true
+        "hasValuesFieldName" : "hasDescription"
       }
     }, {
       "name" : "uri",
@@ -1496,6 +1493,29 @@
     "Aspect" : {
       "name" : "datasetUpstreamLineage"
     }
+  }, {
+    "type" : "record",
+    "name" : "EditableDatasetProperties",
+    "namespace" : "com.linkedin.dataset",
+    "doc" : "EditableDatasetProperties stores editable changes made to dataset properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+    "fields" : [ {
+      "name" : "description",
+      "type" : "string",
+      "doc" : "Documentation of the dataset",
+      "optional" : true
+    }, {
+      "name" : "tags",
+      "type" : {
+        "type" : "array",
+        "items" : "string"
+      },
+      "doc" : "[Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.",
+      "default" : [ ]
+    } ],
+    "Aspect" : {
+      "name" : "editableDatasetProperties"
+    }
   }, {
     "type" : "typeref",
     "name" : "SchemaFieldPath",
@@ -1521,7 +1541,8 @@
       },
       "Searchable" : {
         "fieldName" : "upstreams",
-        "fieldType" : "URN"
+        "fieldType" : "URN",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -1585,8 +1606,7 @@
                       "addToFilters" : true,
                       "boostScore" : 4.0,
                       "fieldName" : "tool",
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "chartId",
@@ -1725,9 +1745,9 @@
                     "doc" : "The name of the AD/LDAP user.",
                     "Searchable" : {
                       "boostScore" : 2.0,
+                      "enableAutocomplete" : true,
                       "fieldName" : "ldap",
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -1811,7 +1831,6 @@
                     "optional" : true,
                     "Searchable" : {
                       "boostScore" : 10.0,
-                      "enableAutocomplete" : true,
                       "fieldType" : "TEXT_PARTIAL",
                       "queryByDefault" : true
                     }
@@ -1845,8 +1864,7 @@
                     "default" : [ ],
                     "Searchable" : {
                       "/*" : {
-                        "fieldType" : "TEXT",
-                        "queryByDefault" : true
+                        "fieldType" : "TEXT"
                       }
                     }
                   }, {
@@ -1859,8 +1877,7 @@
                     "default" : [ ],
                     "Searchable" : {
                       "/*" : {
-                        "fieldType" : "TEXT",
-                        "queryByDefault" : true
+                        "fieldType" : "TEXT"
                       }
                     }
                   }, {
@@ -1912,8 +1929,7 @@
                       "addToFilters" : true,
                       "boostScore" : 4.0,
                       "fieldName" : "tool",
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "dashboardId",
@@ -1959,8 +1975,7 @@
                     "type" : "string",
                     "doc" : "Workflow manager like azkaban, airflow which orchestrates the flow",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "flowId",
@@ -1968,16 +1983,14 @@
                     "doc" : "Unique Identifier of the data flow",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "cluster",
                     "type" : "string",
                     "doc" : "Cluster where the flow is executed",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -2018,9 +2031,14 @@
                     "name" : "flow",
                     "type" : "com.linkedin.common.Urn",
                     "doc" : "Standardized data processing flow urn representing the flow for the job",
+                    "Relationship" : {
+                      "entityTypes" : [ "dataFlow" ],
+                      "name" : "IsPartOf"
+                    },
                     "Searchable" : {
                       "fieldName" : "dataFlow",
-                      "fieldType" : "URN_PARTIAL"
+                      "fieldType" : "URN_PARTIAL",
+                      "queryByDefault" : false
                     }
                   }, {
                     "name" : "jobId",
@@ -2028,8 +2046,7 @@
                     "doc" : "Unique Identifier of the data job",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -2080,8 +2097,7 @@
                     "Searchable" : {
                       "boostScore" : 10.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "origin",
@@ -2089,13 +2105,14 @@
                     "doc" : "Fabric type where dataset belongs to or where it was generated.",
                     "Searchable" : {
                       "addToFilters" : true,
-                      "fieldType" : "TEXT_PARTIAL"
+                      "fieldType" : "TEXT_PARTIAL",
+                      "queryByDefault" : false
                     }
                   } ],
                   "Aspect" : {
                     "name" : "datasetKey"
                   }
-                }, "com.linkedin.dataset.DatasetProperties", "com.linkedin.dataset.DatasetDeprecation", "com.linkedin.dataset.DatasetUpstreamLineage", "com.linkedin.dataset.UpstreamLineage", "com.linkedin.common.InstitutionalMemory", "com.linkedin.common.Ownership", "com.linkedin.common.Status", {
+                }, "com.linkedin.dataset.DatasetProperties", "com.linkedin.dataset.EditableDatasetProperties", "com.linkedin.dataset.DatasetDeprecation", "com.linkedin.dataset.DatasetUpstreamLineage", "com.linkedin.dataset.UpstreamLineage", "com.linkedin.common.InstitutionalMemory", "com.linkedin.common.Ownership", "com.linkedin.common.Status", {
                   "type" : "record",
                   "name" : "SchemaMetadata",
                   "namespace" : "com.linkedin.schema",
@@ -2250,8 +2267,7 @@
                           "doc" : "Flattened name of the field. Field is computed from jsonPath field. For data translation rules refer to wiki page above.",
                           "Searchable" : {
                             "fieldName" : "fieldPaths",
-                            "fieldType" : "TEXT_PARTIAL",
-                            "queryByDefault" : true
+                            "fieldType" : "TEXT_PARTIAL"
                           }
                         }, {
                           "name" : "jsonPath",
@@ -2271,8 +2287,7 @@
                           "Searchable" : {
                             "boostScore" : 0.1,
                             "fieldName" : "fieldDescriptions",
-                            "fieldType" : "TEXT",
-                            "queryByDefault" : true
+                            "fieldType" : "TEXT"
                           }
                         }, {
                           "name" : "type",
@@ -2396,8 +2411,7 @@
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "fieldTags",
-                              "fieldType" : "URN_PARTIAL",
-                              "queryByDefault" : true
+                              "fieldType" : "URN_PARTIAL"
                             }
                           }
                         }, {
@@ -2493,8 +2507,7 @@
                           "Searchable" : {
                             "boostScore" : 0.1,
                             "fieldName" : "editedFieldDescriptions",
-                            "fieldType" : "TEXT",
-                            "queryByDefault" : true
+                            "fieldType" : "TEXT"
                           }
                         }, {
                           "name" : "globalTags",
@@ -2505,8 +2518,7 @@
                             "/tags/*/tag" : {
                               "boostScore" : 0.5,
                               "fieldName" : "editedFieldTags",
-                              "fieldType" : "URN_PARTIAL",
-                              "queryByDefault" : true
+                              "fieldType" : "URN_PARTIAL"
                             }
                           }
                         } ]
@@ -2555,8 +2567,7 @@
                     "Searchable" : {
                       "boostScore" : 4.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "orchestrator",
@@ -2564,15 +2575,15 @@
                     "doc" : "Standardized Orchestrator where data process is defined.\nTODO: Migrate towards something that can be validated like DataPlatform urn",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "origin",
                     "type" : "com.linkedin.common.FabricType",
                     "doc" : "Fabric type where dataset belongs to or where it was generated.",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL"
+                      "fieldType" : "TEXT_PARTIAL",
+                      "queryByDefault" : false
                     }
                   } ],
                   "Aspect" : {
@@ -2654,8 +2665,7 @@
                     "doc" : "Standardized platform urn for the model",
                     "Searchable" : {
                       "boostScore" : 0.1,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "name",
@@ -2664,15 +2674,15 @@
                     "Searchable" : {
                       "boostScore" : 10.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "origin",
                     "type" : "com.linkedin.common.FabricType",
                     "doc" : "Fabric type where model belongs to or where it was generated",
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL"
+                      "fieldType" : "TEXT_PARTIAL",
+                      "queryByDefault" : false
                     }
                   } ],
                   "Aspect" : {
@@ -2690,8 +2700,7 @@
                     "optional" : true,
                     "Searchable" : {
                       "fieldType" : "TEXT",
-                      "hasValuesFieldName" : "hasDescription",
-                      "queryByDefault" : true
+                      "hasValuesFieldName" : "hasDescription"
                     }
                   }, {
                     "name" : "date",
@@ -2709,8 +2718,7 @@
                     "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
                     "optional" : true,
                     "Searchable" : {
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   }, {
                     "name" : "hyperParameters",
@@ -3175,8 +3183,7 @@
                     "Searchable" : {
                       "boostScore" : 10.0,
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -3236,8 +3243,7 @@
                     "type" : "string",
                     "Searchable" : {
                       "enableAutocomplete" : true,
-                      "fieldType" : "TEXT_PARTIAL",
-                      "queryByDefault" : true
+                      "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
                   "Aspect" : {
@@ -3252,10 +3258,7 @@
                     "name" : "definition",
                     "type" : "string",
                     "doc" : "Definition of business term",
-                    "Searchable" : {
-                      "fieldType" : "TEXT",
-                      "queryByDefault" : true
-                    }
+                    "Searchable" : { }
                   }, {
                     "name" : "parentNode",
                     "type" : "com.linkedin.common.GlossaryNodeUrn",
@@ -3328,6 +3331,7 @@
                     "name" : "name",
                     "type" : "string",
                     "Searchable" : {
+                      "enableAutocomplete" : true,
                       "fieldType" : "TEXT_PARTIAL"
                     }
                   } ],
@@ -3343,10 +3347,7 @@
                     "name" : "definition",
                     "type" : "string",
                     "doc" : "Definition of business node",
-                    "Searchable" : {
-                      "fieldType" : "TEXT",
-                      "queryByDefault" : true
-                    }
+                    "Searchable" : { }
                   }, {
                     "name" : "parentNode",
                     "type" : "com.linkedin.common.GlossaryNodeUrn",
diff --git a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json
index 6f8a336dbe8cee..d619f72af96f08 100644
--- a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryNodes.snapshot.json
@@ -73,7 +73,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -182,10 +183,7 @@
           "name" : "definition",
           "type" : "string",
           "doc" : "Definition of business node",
-          "Searchable" : {
-            "fieldType" : "TEXT",
-            "queryByDefault" : true
-          }
+          "Searchable" : { }
         }, {
           "name" : "parentNode",
           "type" : "com.linkedin.common.GlossaryNodeUrn",
@@ -233,6 +231,7 @@
         "name" : "name",
         "type" : "string",
         "Searchable" : {
+          "enableAutocomplete" : true,
           "fieldType" : "TEXT_PARTIAL"
         }
       } ],
diff --git a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json
index 8d80f5a12019f1..45efdd86bcb460 100644
--- a/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.glossary.glossaryTerms.snapshot.json
@@ -100,7 +100,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -218,10 +219,7 @@
           "name" : "definition",
           "type" : "string",
           "doc" : "Definition of business term",
-          "Searchable" : {
-            "fieldType" : "TEXT",
-            "queryByDefault" : true
-          }
+          "Searchable" : { }
         }, {
           "name" : "parentNode",
           "type" : "com.linkedin.common.GlossaryNodeUrn",
@@ -298,8 +296,7 @@
         "type" : "string",
         "Searchable" : {
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json
index e6f8e0a3461006..6d0b4e9c882571 100644
--- a/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.identity.corpGroups.snapshot.json
@@ -107,8 +107,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
diff --git a/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json
index 8cd7341a3ccc18..08c60f22374f6d 100644
--- a/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.identity.corpUsers.snapshot.json
@@ -79,8 +79,7 @@
             "Searchable" : {
               "fieldName" : "tags",
               "fieldType" : "URN_PARTIAL",
-              "hasValuesFieldName" : "hasTags",
-              "queryByDefault" : true
+              "hasValuesFieldName" : "hasTags"
             }
           } ]
         }
@@ -212,7 +211,6 @@
           "optional" : true,
           "Searchable" : {
             "boostScore" : 10.0,
-            "enableAutocomplete" : true,
             "fieldType" : "TEXT_PARTIAL",
             "queryByDefault" : true
           }
@@ -250,8 +248,7 @@
           "default" : [ ],
           "Searchable" : {
             "/*" : {
-              "fieldType" : "TEXT",
-              "queryByDefault" : true
+              "fieldType" : "TEXT"
             }
           }
         }, {
@@ -264,8 +261,7 @@
           "default" : [ ],
           "Searchable" : {
             "/*" : {
-              "fieldType" : "TEXT",
-              "queryByDefault" : true
+              "fieldType" : "TEXT"
             }
           }
         }, {
@@ -319,9 +315,9 @@
         "doc" : "The name of the AD/LDAP user.",
         "Searchable" : {
           "boostScore" : 2.0,
+          "enableAutocomplete" : true,
           "fieldName" : "ldap",
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json
index fcc5220def9985..a1d1ca5bd502c1 100644
--- a/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.ml.mlModels.snapshot.json
@@ -365,7 +365,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -481,8 +482,7 @@
         "doc" : "Standardized platform urn for the model",
         "Searchable" : {
           "boostScore" : 0.1,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "name",
@@ -491,15 +491,15 @@
         "Searchable" : {
           "boostScore" : 10.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "origin",
         "type" : "com.linkedin.common.FabricType",
         "doc" : "Fabric type where model belongs to or where it was generated",
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL"
+          "fieldType" : "TEXT_PARTIAL",
+          "queryByDefault" : false
         }
       } ],
       "Aspect" : {
@@ -517,8 +517,7 @@
         "optional" : true,
         "Searchable" : {
           "fieldType" : "TEXT",
-          "hasValuesFieldName" : "hasDescription",
-          "queryByDefault" : true
+          "hasValuesFieldName" : "hasDescription"
         }
       }, {
         "name" : "date",
@@ -536,8 +535,7 @@
         "doc" : "Type of Algorithm or MLModel such as whether it is a Naive Bayes classifier, Convolutional Neural Network, etc",
         "optional" : true,
         "Searchable" : {
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       }, {
         "name" : "hyperParameters",
diff --git a/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json
index 3db7b7fbb4f273..916052801a32c2 100644
--- a/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.tag.tags.snapshot.json
@@ -65,7 +65,8 @@
       "Searchable" : {
         "fieldName" : "owners",
         "fieldType" : "URN",
-        "hasValuesFieldName" : "hasOwners"
+        "hasValuesFieldName" : "hasOwners",
+        "queryByDefault" : false
       }
     }, {
       "name" : "type",
@@ -200,8 +201,7 @@
         "Searchable" : {
           "boostScore" : 10.0,
           "enableAutocomplete" : true,
-          "fieldType" : "TEXT_PARTIAL",
-          "queryByDefault" : true
+          "fieldType" : "TEXT_PARTIAL"
         }
       } ],
       "Aspect" : {
diff --git a/gms/client/src/main/java/com/linkedin/dataset/client/Datasets.java b/gms/client/src/main/java/com/linkedin/dataset/client/Datasets.java
index 6ff2b9f2ee5ab7..c8dfae4a850c7b 100644
--- a/gms/client/src/main/java/com/linkedin/dataset/client/Datasets.java
+++ b/gms/client/src/main/java/com/linkedin/dataset/client/Datasets.java
@@ -285,6 +285,9 @@ public static DatasetSnapshot toSnapshot(@Nonnull final DatasetUrn datasetUrn, @
         if (dataset.getProperties() != null) {
             aspects.add(ModelUtils.newAspectUnion(DatasetAspect.class, getDatasetPropertiesAspect(dataset)));
         }
+        if (dataset.getEditableProperties() != null) {
+            aspects.add(ModelUtils.newAspectUnion(DatasetAspect.class, dataset.getEditableProperties()));
+        }
         if (dataset.getDeprecation() != null) {
             aspects.add(ModelUtils.newAspectUnion(DatasetAspect.class, dataset.getDeprecation()));
         }
diff --git a/gms/impl/src/main/java/com/linkedin/metadata/resources/dataset/Datasets.java b/gms/impl/src/main/java/com/linkedin/metadata/resources/dataset/Datasets.java
index 65c51b66eed9c5..85c79cdffbcf08 100644
--- a/gms/impl/src/main/java/com/linkedin/metadata/resources/dataset/Datasets.java
+++ b/gms/impl/src/main/java/com/linkedin/metadata/resources/dataset/Datasets.java
@@ -14,6 +14,7 @@
 import com.linkedin.common.GlossaryTerms;
 import com.linkedin.dataset.DatasetKey;
 import com.linkedin.dataset.DatasetProperties;
+import com.linkedin.dataset.EditableDatasetProperties;
 import com.linkedin.dataset.UpstreamLineage;
 import com.linkedin.entity.Entity;
 import com.linkedin.metadata.PegasusUtils;
@@ -181,6 +182,8 @@ protected Dataset toValue(@Nonnull DatasetSnapshot snapshot) {
         value.setGlobalTags(GlobalTags.class.cast(aspect));
       } else if (aspect instanceof EditableSchemaMetadata) {
         value.setEditableSchemaMetadata(EditableSchemaMetadata.class.cast(aspect));
+      } else if (aspect instanceof EditableDatasetProperties) {
+        value.setEditableProperties(EditableDatasetProperties.class.cast(aspect));
       } else if (aspect instanceof GlossaryTerms) {
         value.setGlossaryTerms((GlossaryTerms) aspect);
       }
@@ -225,6 +228,9 @@ protected DatasetSnapshot toSnapshot(@Nonnull Dataset dataset, @Nonnull DatasetU
     if (dataset.hasEditableSchemaMetadata()) {
       aspects.add(ModelUtils.newAspectUnion(DatasetAspect.class, dataset.getEditableSchemaMetadata()));
     }
+    if (dataset.hasEditableProperties()) {
+      aspects.add(ModelUtils.newAspectUnion(DatasetAspect.class, dataset.getEditableProperties()));
+    }
     return ModelUtils.newSnapshot(DatasetSnapshot.class, datasetUrn, aspects);
   }
 
diff --git a/metadata-ingestion/examples/mce_files/bootstrap_mce.json b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
index 499f2798c0b07c..6854e13decf57f 100644
--- a/metadata-ingestion/examples/mce_files/bootstrap_mce.json
+++ b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
@@ -125,6 +125,14 @@
                             }
                         }
                     },
+                    {
+                        "com.linkedin.pegasus2avro.dataset.EditableDatasetProperties": {
+                            "description_123": "TEST",
+                            "tags": [
+                                "myfaketags"
+                            ]
+                        }
+                    },
                     {
                         "com.linkedin.pegasus2avro.common.Ownership": {
                             "owners": [
diff --git a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dataset/__init__.py b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dataset/__init__.py
index 2efda077316592..a1d6834c1bda31 100644
--- a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dataset/__init__.py
+++ b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dataset/__init__.py
@@ -3,6 +3,7 @@
 from .....schema_classes import DatasetLineageTypeClass
 from .....schema_classes import DatasetPropertiesClass
 from .....schema_classes import DatasetUpstreamLineageClass
+from .....schema_classes import EditableDatasetPropertiesClass
 from .....schema_classes import UpstreamClass
 from .....schema_classes import UpstreamLineageClass
 
@@ -12,5 +13,6 @@
 DatasetLineageType = DatasetLineageTypeClass
 DatasetProperties = DatasetPropertiesClass
 DatasetUpstreamLineage = DatasetUpstreamLineageClass
+EditableDatasetProperties = EditableDatasetPropertiesClass
 Upstream = UpstreamClass
 UpstreamLineage = UpstreamLineageClass
diff --git a/metadata-ingestion/src/datahub/metadata/schema.avsc b/metadata-ingestion/src/datahub/metadata/schema.avsc
index 52f89a291e8c15..f32eba7add7706 100644
--- a/metadata-ingestion/src/datahub/metadata/schema.avsc
+++ b/metadata-ingestion/src/datahub/metadata/schema.avsc
@@ -1676,6 +1676,54 @@
                       "name": "datasetProperties"
                     }
                   },
+                  {
+                    "type": "record",
+                    "name": "EditableDatasetProperties",
+                    "namespace": "com.linkedin.pegasus2avro.dataset",
+                    "doc": "EditableDatasetProperties stores editable changes made to dataset properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+                    "fields": [
+                      {
+                        "name": "created",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the creation of this resource/association/sub-resource"
+                      },
+                      {
+                        "name": "lastModified",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"
+                      },
+                      {
+                        "name": "deleted",
+                        "type": [
+                          "null",
+                          "com.linkedin.pegasus2avro.common.AuditStamp"
+                        ],
+                        "doc": "An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics.",
+                        "default": null
+                      },
+                      {
+                        "name": "description",
+                        "type": [
+                          "null",
+                          "string"
+                        ],
+                        "doc": "Documentation of the dataset",
+                        "default": null
+                      },
+                      {
+                        "name": "tags",
+                        "type": {
+                          "type": "array",
+                          "items": "string"
+                        },
+                        "doc": "[Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.",
+                        "default": []
+                      }
+                    ],
+                    "Aspect": {
+                      "name": "editableDatasetProperties"
+                    }
+                  },
                   {
                     "type": "record",
                     "name": "DatasetDeprecation",
diff --git a/metadata-ingestion/src/datahub/metadata/schema_classes.py b/metadata-ingestion/src/datahub/metadata/schema_classes.py
index 3845658a7a819b..0b0bc7d79f7106 100644
--- a/metadata-ingestion/src/datahub/metadata/schema_classes.py
+++ b/metadata-ingestion/src/datahub/metadata/schema_classes.py
@@ -2411,6 +2411,104 @@ def fieldMappings(self, value: List["DatasetFieldMappingClass"]) -> None:
         self._inner_dict['fieldMappings'] = value
     
     
+class EditableDatasetPropertiesClass(DictWrapper):
+    """EditableDatasetProperties stores editable changes made to dataset properties. This separates changes made from
+    ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines"""
+    
+    RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.dataset.EditableDatasetProperties")
+    def __init__(self,
+        created: "AuditStampClass",
+        lastModified: "AuditStampClass",
+        deleted: Union[None, "AuditStampClass"]=None,
+        description: Union[None, str]=None,
+        tags: Optional[List[str]]=None,
+    ):
+        super().__init__()
+        
+        self.created = created
+        self.lastModified = lastModified
+        self.deleted = deleted
+        self.description = description
+        if tags is None:
+            self.tags = []
+        else:
+            self.tags = tags
+    
+    @classmethod
+    def construct_with_defaults(cls) -> "EditableDatasetPropertiesClass":
+        self = cls.construct({})
+        self._restore_defaults()
+        
+        return self
+    
+    def _restore_defaults(self) -> None:
+        self.created = AuditStampClass.construct_with_defaults()
+        self.lastModified = AuditStampClass.construct_with_defaults()
+        self.deleted = self.RECORD_SCHEMA.field_map["deleted"].default
+        self.description = self.RECORD_SCHEMA.field_map["description"].default
+        self.tags = list()
+    
+    
+    @property
+    def created(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        return self._inner_dict.get('created')  # type: ignore
+    
+    
+    @created.setter
+    def created(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        self._inner_dict['created'] = value
+    
+    
+    @property
+    def lastModified(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        return self._inner_dict.get('lastModified')  # type: ignore
+    
+    
+    @lastModified.setter
+    def lastModified(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        self._inner_dict['lastModified'] = value
+    
+    
+    @property
+    def deleted(self) -> Union[None, "AuditStampClass"]:
+        """Getter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        return self._inner_dict.get('deleted')  # type: ignore
+    
+    
+    @deleted.setter
+    def deleted(self, value: Union[None, "AuditStampClass"]) -> None:
+        """Setter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        self._inner_dict['deleted'] = value
+    
+    
+    @property
+    def description(self) -> Union[None, str]:
+        """Getter: Documentation of the dataset"""
+        return self._inner_dict.get('description')  # type: ignore
+    
+    
+    @description.setter
+    def description(self, value: Union[None, str]) -> None:
+        """Setter: Documentation of the dataset"""
+        self._inner_dict['description'] = value
+    
+    
+    @property
+    def tags(self) -> List[str]:
+        """Getter: [Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect."""
+        return self._inner_dict.get('tags')  # type: ignore
+    
+    
+    @tags.setter
+    def tags(self, value: List[str]) -> None:
+        """Setter: [Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect."""
+        self._inner_dict['tags'] = value
+    
+    
 class UpstreamClass(DictWrapper):
     """Upstream lineage information about a dataset including the source reporting the lineage"""
     
@@ -4077,7 +4175,7 @@ class DatasetSnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["DatasetKeyClass", "DatasetPropertiesClass", "DatasetDeprecationClass", "DatasetUpstreamLineageClass", "UpstreamLineageClass", "InstitutionalMemoryClass", "OwnershipClass", "StatusClass", "SchemaMetadataClass", "EditableSchemaMetadataClass", "GlobalTagsClass", "GlossaryTermsClass", "BrowsePathsClass"]],
+        aspects: List[Union["DatasetKeyClass", "DatasetPropertiesClass", "EditableDatasetPropertiesClass", "DatasetDeprecationClass", "DatasetUpstreamLineageClass", "UpstreamLineageClass", "InstitutionalMemoryClass", "OwnershipClass", "StatusClass", "SchemaMetadataClass", "EditableSchemaMetadataClass", "GlobalTagsClass", "GlossaryTermsClass", "BrowsePathsClass"]],
     ):
         super().__init__()
         
@@ -4109,13 +4207,13 @@ def urn(self, value: str) -> None:
     
     
     @property
-    def aspects(self) -> List[Union["DatasetKeyClass", "DatasetPropertiesClass", "DatasetDeprecationClass", "DatasetUpstreamLineageClass", "UpstreamLineageClass", "InstitutionalMemoryClass", "OwnershipClass", "StatusClass", "SchemaMetadataClass", "EditableSchemaMetadataClass", "GlobalTagsClass", "GlossaryTermsClass", "BrowsePathsClass"]]:
+    def aspects(self) -> List[Union["DatasetKeyClass", "DatasetPropertiesClass", "EditableDatasetPropertiesClass", "DatasetDeprecationClass", "DatasetUpstreamLineageClass", "UpstreamLineageClass", "InstitutionalMemoryClass", "OwnershipClass", "StatusClass", "SchemaMetadataClass", "EditableSchemaMetadataClass", "GlobalTagsClass", "GlossaryTermsClass", "BrowsePathsClass"]]:
         """Getter: The list of metadata aspects associated with the dataset. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
     
     
     @aspects.setter
-    def aspects(self, value: List[Union["DatasetKeyClass", "DatasetPropertiesClass", "DatasetDeprecationClass", "DatasetUpstreamLineageClass", "UpstreamLineageClass", "InstitutionalMemoryClass", "OwnershipClass", "StatusClass", "SchemaMetadataClass", "EditableSchemaMetadataClass", "GlobalTagsClass", "GlossaryTermsClass", "BrowsePathsClass"]]) -> None:
+    def aspects(self, value: List[Union["DatasetKeyClass", "DatasetPropertiesClass", "EditableDatasetPropertiesClass", "DatasetDeprecationClass", "DatasetUpstreamLineageClass", "UpstreamLineageClass", "InstitutionalMemoryClass", "OwnershipClass", "StatusClass", "SchemaMetadataClass", "EditableSchemaMetadataClass", "GlobalTagsClass", "GlossaryTermsClass", "BrowsePathsClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the dataset. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
     
@@ -6807,6 +6905,7 @@ def description(self, value: Union[None, str]) -> None:
     'com.linkedin.pegasus2avro.dataset.DatasetLineageType': DatasetLineageTypeClass,
     'com.linkedin.pegasus2avro.dataset.DatasetProperties': DatasetPropertiesClass,
     'com.linkedin.pegasus2avro.dataset.DatasetUpstreamLineage': DatasetUpstreamLineageClass,
+    'com.linkedin.pegasus2avro.dataset.EditableDatasetProperties': EditableDatasetPropertiesClass,
     'com.linkedin.pegasus2avro.dataset.Upstream': UpstreamClass,
     'com.linkedin.pegasus2avro.dataset.UpstreamLineage': UpstreamLineageClass,
     'com.linkedin.pegasus2avro.glossary.GlossaryNodeInfo': GlossaryNodeInfoClass,
@@ -6936,6 +7035,7 @@ def description(self, value: Union[None, str]) -> None:
     'DatasetLineageType': DatasetLineageTypeClass,
     'DatasetProperties': DatasetPropertiesClass,
     'DatasetUpstreamLineage': DatasetUpstreamLineageClass,
+    'EditableDatasetProperties': EditableDatasetPropertiesClass,
     'Upstream': UpstreamClass,
     'UpstreamLineage': UpstreamLineageClass,
     'GlossaryNodeInfo': GlossaryNodeInfoClass,
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
index 882964b012adba..04b2bb33e3d42c 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
@@ -1,10 +1,15 @@
 namespace com.linkedin.dataset
 
+import com.linkedin.common.ChangeAuditStamps
+
 /**
- * Properties associated with a Dataset
+ * EditableDatasetProperties stores editable changes made to dataset properties. This separates changes made from
+ * ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines
  */
-record EditableDatasetProperties {
-
+@Aspect = {
+  "name": "editableDatasetProperties"
+}
+record EditableDatasetProperties includes ChangeAuditStamps {
   /**
    * Documentation of the dataset
    */
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DatasetAspect.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DatasetAspect.pdl
index e17a9074fb766c..dea6458405c6ee 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DatasetAspect.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DatasetAspect.pdl
@@ -3,6 +3,7 @@ namespace com.linkedin.metadata.aspect
 import com.linkedin.metadata.key.DatasetKey
 import com.linkedin.dataset.DatasetDeprecation
 import com.linkedin.dataset.DatasetProperties
+import com.linkedin.dataset.EditableDatasetProperties
 import com.linkedin.dataset.DatasetUpstreamLineage
 import com.linkedin.dataset.UpstreamLineage
 import com.linkedin.schema.SchemaMetadata
@@ -20,6 +21,7 @@ import com.linkedin.common.BrowsePaths
 typeref DatasetAspect = union[
   DatasetKey,
   DatasetProperties,
+  EditableDatasetProperties,
   DatasetDeprecation,
   DatasetUpstreamLineage,
   UpstreamLineage,

From 6591d189aafac4aa57a3df9ac09e7c763454c526 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Wed, 9 Jun 2021 23:46:54 +0800
Subject: [PATCH 07/21] feat(react): add dataset description update behavior,
 update markdownviewer, schema table update

---
 .../entity/dataset/profile/DatasetHeader.tsx  | 36 +++++---
 .../entity/dataset/profile/DatasetProfile.tsx | 15 +---
 .../profile/modal/UpdateDescriptionModal.tsx  |  7 +-
 .../entity/dataset/profile/schema/Schema.tsx  | 12 +--
 .../profile/schema/SchemaDescriptionField.tsx | 25 ++----
 .../src/app/entity/shared/MarkdownViewer.tsx  | 83 ++++++++++++++-----
 datahub-web-react/src/graphql/dataset.graphql |  4 +
 7 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
index 21f3b52b363329..bcc30484475a52 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
@@ -2,7 +2,7 @@ import { Badge, Divider, message, Popover, Space, Tag, Typography } from 'antd';
 import { FetchResult } from '@apollo/client';
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { Dataset, EditableProperties } from '../../../../types.generated';
+import { Dataset } from '../../../../types.generated';
 import { UpdateDatasetMutation } from '../../../../graphql/dataset.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { AvatarsGroup } from '../../../shared/avatar';
@@ -18,29 +18,27 @@ const DescriptionText = styled(MarkdownViewer)`
 const AddNewDescription = styled(Tag)`
     cursor: pointer;
 `;
+
 const MessageKey = 'AddDatasetDescription';
 
 export type Props = {
     dataset: Dataset;
-    updateProperties: (
-        update: EditableProperties,
-    ) => Promise<FetchResult<UpdateDatasetMutation, Record<string, any>, Record<string, any>>>;
     updateDescription: (
-        description: string,
+        description: string | null,
     ) => Promise<FetchResult<UpdateDatasetMutation, Record<string, any>, Record<string, any>>>;
 };
 
 export default function DatasetHeader({
-    dataset: { description, ownership, deprecation, platform },
-    // updateProperties,
+    dataset: { description: originalDesc, ownership, deprecation, platform, editableProperties },
     updateDescription,
 }: Props) {
     const entityRegistry = useEntityRegistry();
     const isCompact = React.useContext(CompactContext);
     const platformName = capitalizeFirstLetter(platform.name);
     const [showAddDescModal, setShowAddDescModal] = useState(false);
+    const updatedDesc = editableProperties?.description;
 
-    const onAddDescription = async (desc: string) => {
+    const onUpdateSubmit = async (desc: string | null) => {
         message.loading({ content: 'Updating...', key: MessageKey });
         await updateDescription(desc);
         message.success({ content: 'Updated!', key: MessageKey, duration: 2 });
@@ -54,8 +52,24 @@ export default function DatasetHeader({
                     <Typography.Text>Dataset</Typography.Text>
                     <Typography.Text strong>{platformName}</Typography.Text>
                 </Space>
-                {description ? (
-                    <DescriptionText isCompact={isCompact} source={description} />
+                {updatedDesc || originalDesc ? (
+                    <>
+                        <DescriptionText
+                            isCompact={isCompact}
+                            source={updatedDesc || originalDesc || ''}
+                            editable
+                            onEditClicked={() => setShowAddDescModal(true)}
+                        />
+                        {showAddDescModal && (
+                            <UpdateDescriptionModal
+                                title="Update description"
+                                onClose={() => setShowAddDescModal(false)}
+                                onSubmit={onUpdateSubmit}
+                                original={originalDesc || ''}
+                                description={updatedDesc || ''}
+                            />
+                        )}
+                    </>
                 ) : (
                     <>
                         <AddNewDescription color="success" onClick={() => setShowAddDescModal(true)}>
@@ -65,7 +79,7 @@ export default function DatasetHeader({
                             <UpdateDescriptionModal
                                 title="Add description"
                                 onClose={() => setShowAddDescModal(false)}
-                                onSubmit={onAddDescription}
+                                onSubmit={onUpdateSubmit}
                                 isAddDesc
                             />
                         )}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx b/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
index e946e41c141283..dbfba24ba9696d 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
@@ -61,23 +61,16 @@ export const DatasetProfile = ({ urn }: { urn: string }): JSX.Element => {
     const getHeader = (dataset: Dataset) => (
         <DatasetHeader
             dataset={dataset}
-            updateProperties={(update) => {
-                analytics.event({
-                    type: EventType.EntityActionEvent,
-                    actionType: EntityActionType.UpdateProperties,
-                    entityType: EntityType.Dataset,
-                    entityUrn: urn,
-                });
-                return updateDataset({ variables: { input: { urn, editableProperties: update } } });
-            }}
-            updateDescription={(description: string) => {
+            updateDescription={(description: string | null) => {
                 analytics.event({
                     type: EventType.EntityActionEvent,
                     actionType: EntityActionType.UpdateDescription,
                     entityType: EntityType.Dataset,
                     entityUrn: urn,
                 });
-                return updateDataset({ variables: { input: { urn, description } } });
+                return updateDataset({
+                    variables: { input: { urn, editableProperties: { description: description || '' } } },
+                });
             }}
         />
     );
diff --git a/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx b/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
index 118149942199b1..55792f5f85c36d 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
@@ -17,7 +17,7 @@ type Props = {
     description?: string | undefined;
     original?: string | undefined;
     onClose: () => void;
-    onSubmit: (description: string) => void;
+    onSubmit: (description: string | null) => void;
     isAddDesc?: boolean;
 };
 
@@ -35,10 +35,7 @@ export default function UpdateDescriptionModal({ title, description, original, o
             footer={
                 <>
                     <Button onClick={onClose}>Cancel</Button>
-                    <Button
-                        onClick={() => updatedDesc && onSubmit(updatedDesc)}
-                        disabled={!updatedDesc || updatedDesc.length === 0 || updatedDesc === description}
-                    >
+                    <Button onClick={() => onSubmit(updatedDesc || null)} disabled={updatedDesc === description}>
                         Update
                     </Button>
                 </>
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
index 7b0a1d5f3baf02..2ba45bab7f9ce4 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/Schema.tsx
@@ -108,7 +108,6 @@ function convertEditableSchemaMetadataForUpdate(
 
 export default function SchemaView({ urn, schema, editableSchemaMetadata, updateEditableSchema }: Props) {
     const [tagHoveredIndex, setTagHoveredIndex] = useState<string | undefined>(undefined);
-    const [descHoveredIndex, setDescHoveredIndex] = useState<string | undefined>(undefined);
     const [showRaw, setShowRaw] = useState(false);
     const [rows, setRows] = useState<Array<ExtendedSchemaFields>>([]);
 
@@ -195,7 +194,7 @@ export default function SchemaView({ urn, schema, editableSchemaMetadata, update
         return updateSchema(newFieldInfo, record);
     };
 
-    const descriptionRender = (description: string, record: SchemaField, rowIndex: number | undefined) => {
+    const descriptionRender = (description: string, record: SchemaField) => {
         const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo.find(
             (candidateEditableFieldInfo) => candidateEditableFieldInfo.fieldPath === record.fieldPath,
         ) || { fieldPath: record.fieldPath };
@@ -203,7 +202,6 @@ export default function SchemaView({ urn, schema, editableSchemaMetadata, update
             <DescriptionField
                 description={description}
                 updatedDescription={relevantEditableFieldInfo.description}
-                onHover={descHoveredIndex !== undefined && descHoveredIndex === `${record.fieldPath}-${rowIndex}`}
                 onUpdate={(update) => onUpdateDescription(update, relevantEditableFieldInfo)}
             />
         );
@@ -234,14 +232,6 @@ export default function SchemaView({ urn, schema, editableSchemaMetadata, update
         key: 'description',
         render: descriptionRender,
         width: 300,
-        onCell: (record: SchemaField, rowIndex: number | undefined) => ({
-            onMouseEnter: () => {
-                setDescHoveredIndex(`${record.fieldPath}-${rowIndex}`);
-            },
-            onMouseLeave: () => {
-                setDescHoveredIndex(undefined);
-            },
-        }),
     };
 
     const tagAndTermColumn = {
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
index 6c9c1cc23f9707..e9b05f58cb3c34 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
@@ -1,5 +1,4 @@
 import { Typography, message } from 'antd';
-import { EditOutlined } from '@ant-design/icons';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 import { FetchResult } from '@apollo/client';
@@ -8,23 +7,16 @@ import { UpdateDatasetMutation } from '../../../../../graphql/dataset.generated'
 import UpdateDescriptionModal from '../modal/UpdateDescriptionModal';
 import MarkdownViewer from '../../../shared/MarkdownViewer';
 
-const DescriptionContainer = styled.div<{ hover?: string }>`
+const DescriptionContainer = styled.div`
     position: relative;
     display: flex;
     flex-direction: row;
-    ${(props) => (props.hover ? '' : 'padding-right: 19px;')}
 `;
 
 const DescriptionText = styled(MarkdownViewer)`
     padding-right: 8px;
 `;
 
-const EditIcon = styled(EditOutlined)`
-    cursor: pointer;
-    margin-top: 5px;
-    margin-left: 5px;
-`;
-
 const EditedLabel = styled(Typography.Text)`
     position: absolute;
     right: -10px;
@@ -38,20 +30,19 @@ const MessageKey = 'UpdateSchemaDescription';
 type Props = {
     description: string;
     updatedDescription?: string | null;
-    onHover: boolean;
     onUpdate: (
         description: string,
     ) => Promise<FetchResult<UpdateDatasetMutation, Record<string, any>, Record<string, any>> | void>;
 };
 
-export default function DescriptionField({ description, updatedDescription, onHover, onUpdate }: Props) {
+export default function DescriptionField({ description, updatedDescription, onUpdate }: Props) {
     const [showAddModal, setShowAddModal] = useState(false);
 
     const onCloseModal = () => setShowAddModal(false);
 
-    const onUpdateModal = async (desc: string) => {
+    const onUpdateModal = async (desc: string | null) => {
         message.loading({ content: 'Updating...', key: MessageKey });
-        await onUpdate(desc);
+        await onUpdate(desc || '');
         message.success({ content: 'Updated!', key: MessageKey, duration: 2 });
         onCloseModal();
     };
@@ -62,10 +53,12 @@ export default function DescriptionField({ description, updatedDescription, onHo
                 e.preventDefault();
                 e.stopPropagation();
             }}
-            hover={onHover ? 'true' : undefined}
         >
-            <DescriptionText source={updatedDescription || description} />
-            {onHover && <EditIcon twoToneColor="#52c41a" onClick={() => setShowAddModal(true)} />}
+            <DescriptionText
+                source={updatedDescription || description}
+                editable
+                onEditClicked={() => setShowAddModal(true)}
+            />
             {updatedDescription && <EditedLabel>(edited)</EditedLabel>}
             {showAddModal && (
                 <div>
diff --git a/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx b/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
index f0bf0283eee21d..2faca79f32e1d6 100644
--- a/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
+++ b/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
@@ -1,21 +1,44 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { Button, Typography } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
 import MDEditor from '@uiw/react-md-editor';
-import { MarkdownPreviewProps } from '@uiw/react-markdown-preview';
 import styled from 'styled-components';
 
 const { Text } = Typography;
 
-const MarkdownContainer = styled.div<{ showall?: string }>`
+const EditIcon = styled(EditOutlined)`
+    cursor: pointer;
+    position: absolute;
+    padding: 2px;
+    top: 0;
+    right: -8px;
+    display: none;
+`;
+
+const MarkdownContainer = styled.div<{ editable?: string }>`
     max-width: 100%;
     max-width: 900px;
+    position: relative;
+
+    ${(props) =>
+        props.editable
+            ? `
+        &:hover ${EditIcon} {
+            display: block;
+        }
+        padding-right: 15px;
+        `
+            : ''}
 `;
 
-type MarkdownViewProps = MarkdownPreviewProps & {
-    showall?: string;
-};
+const CustomButton = styled(Button)`
+    padding: 0;
+`;
 
-const MarkdownView = styled(({ showall: _, ...props }: MarkdownViewProps) => <MDEditor.Markdown {...props} />)`
+const MarkdownViewContainer = styled.div<{
+    showall?: string;
+    limit?: string;
+}>`
     display: block;
     overflow-wrap: break-word;
     word-wrap: break-word;
@@ -23,44 +46,58 @@ const MarkdownView = styled(({ showall: _, ...props }: MarkdownViewProps) => <MD
         props.showall
             ? ''
             : `
-        max-height: 150px;
-        margin-bottom: 15px;
+        max-height: ${props.limit}px;
         `}
+    margin-bottom: 10px;
     overflow-x: hidden;
     overflow-y: auto;
 `;
 
+const MarkdownView = styled(MDEditor.Markdown)`
+    display: block;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    max-width: 100%;
+    height: auto;
+`;
+
 export type Props = {
     source: string;
     limit?: number;
     isCompact?: boolean;
+    editable?: boolean;
+    onEditClicked?: () => void;
 };
 
-export default function MarkdownViewer({ source, limit = 150 }: Props) {
+export default function MarkdownViewer({ source, limit = 150, editable, onEditClicked }: Props) {
     const [height, setHeight] = useState(0);
     const [showAll, setShowAll] = useState(false);
     const ref = useRef(null);
-    const isOverLimit = height >= limit;
 
     useEffect(() => {
         if (ref && ref.current) {
-            setHeight((ref.current as any).clientHeight);
+            // Get markdown editor height
+            if ((ref.current as any)?.clientHeight) {
+                setHeight((ref.current as any).clientHeight);
+            } else if ((ref.current as any)?.mdp?.current?.clientHeight) {
+                setHeight((ref.current as any).mdp.current.clientHeight);
+            }
         }
-    }, []);
+    }, [ref, source]);
 
     return (
-        <MarkdownContainer ref={ref}>
-            <MarkdownView source={source} showall={isOverLimit && showAll ? 'true' : undefined} />
-            {isOverLimit && (
-                <>
-                    {!showAll && <Text>...</Text>}
-                    <Button type="link" onClick={() => setShowAll(!showAll)}>
-                        <Text italic type="secondary">
-                            {showAll ? 'Show less' : 'show more'}
-                        </Text>
-                    </Button>
-                </>
+        <MarkdownContainer editable={editable ? 'true' : undefined}>
+            <MarkdownViewContainer showall={height >= limit && showAll ? 'true' : undefined} limit={`${limit}`}>
+                <MarkdownView ref={ref} source={source} />
+            </MarkdownViewContainer>
+            {height >= limit && (
+                <CustomButton type="link" onClick={() => setShowAll(!showAll)}>
+                    <Text italic type="secondary">
+                        {showAll ? 'show less' : '... show more'}
+                    </Text>
+                </CustomButton>
             )}
+            <EditIcon twoToneColor="#52c41a" onClick={onEditClicked} />
         </MarkdownContainer>
     );
 }
diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
index 7d23bf4204ebea..df86b6fa0e0c02 100644
--- a/datahub-web-react/src/graphql/dataset.graphql
+++ b/datahub-web-react/src/graphql/dataset.graphql
@@ -30,6 +30,10 @@ query getDataset($urn: String!) {
             key
             value
         }
+        editableProperties {
+            description
+            tags
+        }
         ownership {
             ...ownershipFields
         }

From 914fa30eaefeebba3025debedfa85d1889bd5cc9 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Thu, 10 Jun 2021 02:41:10 +0800
Subject: [PATCH 08/21] feat(react): add markdown supported text

---
 .../profile/modal/UpdateDescriptionModal.tsx    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx b/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
index 55792f5f85c36d..9b8f29eecff910 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
@@ -12,6 +12,13 @@ const FormLabel = styled(Typography.Text)`
     font-weight: bold;
 `;
 
+const MarkDownHelpLink = styled(Typography.Link)`
+    position: absolute;
+    right: 0;
+    top: -18px;
+    font-size: 12px;
+`;
+
 type Props = {
     title: string;
     description?: string | undefined;
@@ -48,9 +55,17 @@ export default function UpdateDescriptionModal({ title, description, original, o
                     </Form.Item>
                 )}
                 {isAddDesc ? (
-                    <MDEditor value={updatedDesc} onChange={(v) => setDesc(v || '')} preview="live" height={400} />
+                    <Form.Item>
+                        <MarkDownHelpLink href="https://joplinapp.org/markdown" target="_blank" type="secondary">
+                            markdown supported
+                        </MarkDownHelpLink>
+                        <MDEditor value={updatedDesc} onChange={(v) => setDesc(v || '')} preview="live" height={400} />
+                    </Form.Item>
                 ) : (
                     <Form.Item label={<FormLabel>Updated:</FormLabel>}>
+                        <MarkDownHelpLink href="https://joplinapp.org/markdown" target="_blank" type="secondary">
+                            markdown supported
+                        </MarkDownHelpLink>
                         <MDEditor value={updatedDesc} onChange={(v) => setDesc(v || '')} preview="live" height={400} />
                     </Form.Item>
                 )}

From 9aa10e78dcc3d1444a75894e64c46edea7711e97 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Fri, 11 Jun 2021 01:53:36 +0800
Subject: [PATCH 09/21] feat(graphql, metadata): add editablproperties aspects
 in chart, dashboard, datajob, dataflow, update graphql

---
 .../chart/mappers/ChartSnapshotMapper.java    |   5 +
 .../chart/mappers/ChartUpdateInputMapper.java |   7 +
 .../mappers/DashboardSnapshotMapper.java      |   6 +
 .../mappers/DashboardUpdateInputMapper.java   |   7 +
 .../mappers/DataFlowSnapshotMapper.java       |   6 +
 .../mappers/DataFlowUpdateInputMapper.java    |   7 +
 .../mappers/DataJobSnapshotMapper.java        |   6 +
 .../mappers/DataJobUpdateInputMapper.java     |   7 +
 .../mappers/DatasetSnapshotMapper.java        |   8 +-
 .../mappers/DatasetUpdateInputMapper.java     |   8 +-
 .../src/main/resources/gms.graphql            | 218 ++++++++---
 datahub-web-react/src/Mocks.tsx               |   4 +
 datahub-web-react/src/graphql/chart.graphql   |   6 +
 datahub-web-react/src/graphql/dataset.graphql |   4 +-
 .../src/graphql/fragments.graphql             |  13 +-
 .../pegasus/com/linkedin/dashboard/Chart.pdl  |   6 +
 .../com/linkedin/dashboard/Dashboard.pdl      |   5 +
 .../pegasus/com/linkedin/datajob/DataFlow.pdl |   5 +
 .../pegasus/com/linkedin/datajob/DataJob.pdl  |   5 +
 .../com.linkedin.chart.charts.snapshot.json   |  31 +-
 ...inkedin.dashboard.dashboards.snapshot.json |  22 +-
 ....linkedin.dataflow.dataFlows.snapshot.json |  20 +-
 ...om.linkedin.datajob.dataJobs.snapshot.json |  36 +-
 ...om.linkedin.dataset.datasets.snapshot.json |  11 +-
 ...com.linkedin.entity.entities.snapshot.json |  83 +++-
 .../linkedin/pegasus2avro/chart/__init__.py   |   2 +
 .../pegasus2avro/dashboard/__init__.py        |   2 +
 .../linkedin/pegasus2avro/datajob/__init__.py |   4 +
 .../src/datahub/metadata/schema.avsc          | 166 +++++++-
 .../src/datahub/metadata/schema_classes.py    | 369 ++++++++++++++++--
 .../chart/EditableChartProperties.pdl         |  14 +
 .../dashboard/EditableDashboardProperties.pdl |  14 +
 .../datajob/EditableDataflowProperties.pdl    |  14 +
 .../datajob/EditableDatajobProperties.pdl     |  14 +
 .../dataset/EditableDatasetProperties.pdl     |   5 +-
 .../linkedin/metadata/aspect/ChartAspect.pdl  |   2 +
 .../metadata/aspect/DashboardAspect.pdl       |   2 +
 .../metadata/aspect/DataJobAspect.pdl         |   4 +
 38 files changed, 1018 insertions(+), 130 deletions(-)
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/chart/EditableChartProperties.pdl
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/dashboard/EditableDashboardProperties.pdl
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDataflowProperties.pdl
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDatajobProperties.pdl

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartSnapshotMapper.java
index 2f9b63d2e67f2c..da182b619dfbae 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartSnapshotMapper.java
@@ -8,6 +8,7 @@
 import com.linkedin.datahub.graphql.generated.ChartType;
 import com.linkedin.datahub.graphql.generated.Dataset;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.ChartEditableProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StringMapMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
@@ -49,6 +50,10 @@ public Chart apply(@Nonnull final ChartSnapshot chart) {
                 result.setStatus(StatusMapper.map(aspect.getStatus()));
             } else if (aspect.isGlobalTags()) {
                 result.setGlobalTags(GlobalTagsMapper.map(aspect.getGlobalTags()));
+            } else if (aspect.isEditableChartProperties()) {
+                final ChartEditableProperties chartEditableProperties = new ChartEditableProperties();
+                chartEditableProperties.setDescription(aspect.getEditableChartProperties().getDescription());
+                result.setEditableProperties(chartEditableProperties);
             } else {
                 // throw new RuntimeException(String.format("Unrecognized aspect %s returned", aspect.toString()));
             }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputMapper.java
index 2922d41a507241..eb372d5f6fd591 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputMapper.java
@@ -1,5 +1,6 @@
 package com.linkedin.datahub.graphql.types.chart.mappers;
 
+import com.linkedin.chart.EditableChartProperties;
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.Urn;
@@ -40,6 +41,12 @@ public Chart apply(@Nonnull final ChartUpdateInput chartUpdateInput,
             );
             result.setGlobalTags(globalTags);
         }
+
+        if (chartUpdateInput.getEditableProperties() != null) {
+            final EditableChartProperties editableChartProperties = new EditableChartProperties();
+            editableChartProperties.setDescription(chartUpdateInput.getEditableProperties().getDescription());
+            result.setEditableProperties(editableChartProperties);
+        }
         return result;
     }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardSnapshotMapper.java
index eb2eee4d1b22ee..f57fd9880f2e44 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardSnapshotMapper.java
@@ -3,11 +3,13 @@
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.Ownership;
 import com.linkedin.common.Status;
+import com.linkedin.dashboard.EditableDashboardProperties;
 import com.linkedin.datahub.graphql.generated.AccessLevel;
 import com.linkedin.datahub.graphql.generated.Chart;
 import com.linkedin.datahub.graphql.generated.Dashboard;
 import com.linkedin.datahub.graphql.generated.DashboardInfo;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.DashboardEditableProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
@@ -48,6 +50,10 @@ public Dashboard apply(@Nonnull final DashboardSnapshot dashboard) {
                 result.setStatus(StatusMapper.map(status));
             } else if (aspect instanceof GlobalTags) {
                 result.setGlobalTags(GlobalTagsMapper.map(GlobalTags.class.cast(aspect)));
+            } else if (aspect instanceof EditableDashboardProperties) {
+                final DashboardEditableProperties dashboardEditableProperties = new DashboardEditableProperties();
+                dashboardEditableProperties.setDescription(((EditableDashboardProperties) aspect).getDescription());
+                result.setEditableProperties(dashboardEditableProperties);
             }
         });
         return result;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputMapper.java
index f7d5bb5d8b1dac..ac59d7785db908 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputMapper.java
@@ -4,6 +4,7 @@
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.dashboard.Dashboard;
+import com.linkedin.dashboard.EditableDashboardProperties;
 import com.linkedin.datahub.graphql.generated.DashboardUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
@@ -40,6 +41,12 @@ public Dashboard apply(@Nonnull final DashboardUpdateInput dashboardUpdateInput,
             );
             result.setGlobalTags(globalTags);
         }
+
+        if (dashboardUpdateInput.getEditableProperties() != null) {
+            final EditableDashboardProperties editableDashboardProperties = new EditableDashboardProperties();
+            editableDashboardProperties.setDescription(dashboardUpdateInput.getEditableProperties().getDescription());
+            result.setEditableProperties(editableDashboardProperties);
+        }
         return result;
     }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowSnapshotMapper.java
index 78069e28a2fa33..f084a08b382250 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowSnapshotMapper.java
@@ -4,6 +4,7 @@
 import com.linkedin.common.Ownership;
 import com.linkedin.common.Status;
 import com.linkedin.datahub.graphql.generated.DataFlow;
+import com.linkedin.datahub.graphql.generated.DataFlowEditableProperties;
 import com.linkedin.datahub.graphql.generated.DataFlowInfo;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
@@ -11,6 +12,7 @@
 import com.linkedin.datahub.graphql.types.common.mappers.StringMapMapper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
+import com.linkedin.datajob.EditableDataflowProperties;
 import com.linkedin.metadata.dao.utils.ModelUtils;
 import com.linkedin.metadata.snapshot.DataFlowSnapshot;
 import javax.annotation.Nonnull;
@@ -45,6 +47,10 @@ public DataFlow apply(@Nonnull final DataFlowSnapshot dataflow) {
                 result.setStatus(StatusMapper.map(status));
             } else if (aspect instanceof GlobalTags) {
                 result.setGlobalTags(GlobalTagsMapper.map(GlobalTags.class.cast(aspect)));
+            } else if (aspect instanceof EditableDataflowProperties) {
+                final DataFlowEditableProperties dataFlowEditableProperties = new DataFlowEditableProperties();
+                dataFlowEditableProperties.setDescription(((EditableDataflowProperties) aspect).getDescription());
+                result.setEditableProperties(dataFlowEditableProperties);
             }
         });
         return result;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java
index 72c1e652fe653c..7c38068df16b69 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java
@@ -8,6 +8,7 @@
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.TagAssociationUpdateMapper;
 import com.linkedin.datajob.DataFlow;
+import com.linkedin.datajob.EditableDataflowProperties;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Collectors;
@@ -40,6 +41,12 @@ public DataFlow apply(@Nonnull final DataFlowUpdateInput dataFlowUpdateInput,
             );
             result.setGlobalTags(globalTags);
         }
+
+        if (dataFlowUpdateInput.getEditableProperties() != null) {
+            final EditableDataflowProperties editableDataflowProperties = new EditableDataflowProperties();
+            editableDataflowProperties.setDescription(dataFlowUpdateInput.getEditableProperties().getDescription());
+            result.setEditableProperties(editableDataflowProperties);
+        }
         return result;
     }
 }
\ No newline at end of file
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobSnapshotMapper.java
index 1cab65d47b5bde..4fa5041da516f7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobSnapshotMapper.java
@@ -10,11 +10,13 @@
 import com.linkedin.datahub.graphql.generated.DataJobInputOutput;
 import com.linkedin.datahub.graphql.generated.Dataset;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.DataJobEditableProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StringMapMapper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
+import com.linkedin.datajob.EditableDatajobProperties;
 import com.linkedin.metadata.dao.utils.ModelUtils;
 import com.linkedin.metadata.snapshot.DataJobSnapshot;
 import java.util.stream.Collectors;
@@ -52,6 +54,10 @@ public DataJob apply(@Nonnull final DataJobSnapshot dataJob) {
                 result.setStatus(StatusMapper.map(status));
             } else if (aspect instanceof GlobalTags) {
                 result.setGlobalTags(GlobalTagsMapper.map(GlobalTags.class.cast(aspect)));
+            } else if (aspect instanceof EditableDatajobProperties) {
+                final DataJobEditableProperties dataJobEditableProperties = new DataJobEditableProperties();
+                dataJobEditableProperties.setDescription(((EditableDatajobProperties) aspect).getDescription());
+                result.setEditableProperties(dataJobEditableProperties);
             }
         });
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
index d325e7e7c86780..8c8d9875ba61bb 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
@@ -8,6 +8,7 @@
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.TagAssociationUpdateMapper;
 import com.linkedin.datajob.DataJob;
+import com.linkedin.datajob.EditableDatajobProperties;
 
 import javax.annotation.Nonnull;
 import java.util.stream.Collectors;
@@ -40,6 +41,12 @@ public DataJob apply(@Nonnull final DataJobUpdateInput dataJobUpdateInput,
             );
             result.setGlobalTags(globalTags);
         }
+
+        if (dataJobUpdateInput.getEditableProperties() != null) {
+            final EditableDatajobProperties editableDatajobProperties = new EditableDatajobProperties();
+            editableDatajobProperties.setDescription(dataJobUpdateInput.getEditableProperties().getDescription());
+            result.setEditableProperties(editableDatajobProperties);
+        }
         return result;
     }
 }
\ No newline at end of file
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
index c50456baf04086..e9529290f60acb 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
@@ -9,7 +9,7 @@
 import com.linkedin.datahub.graphql.generated.Dataset;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.FabricType;
-import com.linkedin.datahub.graphql.generated.EditableProperties;
+import com.linkedin.datahub.graphql.generated.DatasetEditableProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.InstitutionalMemoryMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
@@ -84,9 +84,11 @@ public Dataset apply(@Nonnull final DatasetSnapshot dataset) {
               result.setEditableSchemaMetadata(EditableSchemaMetadataMapper.map((EditableSchemaMetadata) aspect));
             } else if (aspect instanceof EditableDatasetProperties) {
                 final EditableDatasetProperties editableDatasetProperties = (EditableDatasetProperties) aspect;
-                final EditableProperties editableProperties = new EditableProperties();
+                final DatasetEditableProperties editableProperties = new DatasetEditableProperties();
                 editableProperties.setDescription(editableDatasetProperties.getDescription());
-                editableProperties.setTags(editableDatasetProperties.getTags());
+                if (editableDatasetProperties.getGlobalTags() != null) {
+                    editableProperties.setGlobalTags(GlobalTagsMapper.map(editableDatasetProperties.getGlobalTags()));
+                }
                 result.setEditableProperties(editableProperties);
             }
         });
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
index ef7968205b1a89..a5391169734a80 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
@@ -5,7 +5,6 @@
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.Urn;
-import com.linkedin.data.template.StringArray;
 import com.linkedin.datahub.graphql.generated.DatasetUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.InstitutionalMemoryUpdateMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
@@ -79,8 +78,11 @@ public Dataset apply(@Nonnull final DatasetUpdateInput datasetUpdateInput,
         if (datasetUpdateInput.getEditableProperties() != null) {
             final EditableDatasetProperties editableDatasetProperties = new EditableDatasetProperties();
             editableDatasetProperties.setDescription(datasetUpdateInput.getEditableProperties().getDescription());
-            if (datasetUpdateInput.getEditableProperties().getTags() != null) {
-                editableDatasetProperties.setTags(new StringArray(datasetUpdateInput.getEditableProperties().getTags()));
+            if (datasetUpdateInput.getEditableProperties().getGlobalTags() != null) {
+                final GlobalTags globalTags = new GlobalTags();
+                globalTags.setTags(new TagAssociationArray(datasetUpdateInput.getEditableProperties().getGlobalTags().getTags().stream().map(
+                        element -> TagAssociationUpdateMapper.map(element)).collect(Collectors.toList())));
+                editableDatasetProperties.setGlobalTags(globalTags);
             }
             result.setEditableProperties(editableDatasetProperties);
         }
diff --git a/datahub-graphql-core/src/main/resources/gms.graphql b/datahub-graphql-core/src/main/resources/gms.graphql
index fbf650480676ee..dff02a84c07730 100644
--- a/datahub-graphql-core/src/main/resources/gms.graphql
+++ b/datahub-graphql-core/src/main/resources/gms.graphql
@@ -245,7 +245,7 @@ type Dataset implements EntityWithRelationships & Entity {
     """
     A list of editable platform-specific metadata tuples
     """
-    editableProperties: EditableProperties
+    editableProperties: DatasetEditableProperties
 
     """
     External URL associated with the Dataset
@@ -625,18 +625,6 @@ type SchemaField {
     glossaryTerms: GlossaryTerms
 }
 
-type EditableProperties {
-    """
-    Description
-    """
-    description: String!
-
-    """
-    Tags
-    """
-    tags: [String!]
-}
-
 type EditableSchemaMetadata {
     editableSchemaFieldInfo: [EditableSchemaFieldInfo!]!
 }
@@ -673,6 +661,41 @@ enum SchemaFieldDataType {
     UNION
     STRUCT
 }
+type DatasetEditableProperties {
+    """
+    Description
+    """
+    description: String!
+
+    """
+    Tags
+    """
+    globalTags: GlobalTags
+}
+type ChartEditableProperties {
+    """
+    Description
+    """
+    description: String!
+}
+type DashboardEditableProperties {
+    """
+    Description
+    """
+    description: String!
+}
+type DataJobEditableProperties {
+    """
+    Description
+    """
+    description: String!
+}
+type DataFlowEditableProperties {
+    """
+    Description
+    """
+    description: String!
+}
 
 type EntityRelationship {
     """
@@ -1359,71 +1382,91 @@ type BrowsePath {
 }
 
 input ChartUpdateInput {
-   """
-   The chart urn
-   """
-   urn: String!
+    """
+    The chart urn
+    """
+    urn: String!
 
-   """
-   Update to ownership
-   """
-   ownership: OwnershipUpdate
+    """
+    Update to ownership
+    """
+    ownership: OwnershipUpdate
+
+    """
+    Update to global tags
+    """
+    globalTags: GlobalTagsUpdate
 
-   """
-   Update to global tags
-   """
-   globalTags: GlobalTagsUpdate
+    """
+    Update to editable properties
+    """
+    editableProperties: ChartEditablePropertiesUpdate
 }
 
 input DashboardUpdateInput {
-   """
-   The dashboard urn
-   """
-   urn: String!
+    """
+    The dashboard urn
+    """
+    urn: String!
 
-   """
-   Update to ownership
-   """
-   ownership: OwnershipUpdate
+    """
+    Update to ownership
+    """
+    ownership: OwnershipUpdate
+
+    """
+    Update to global tags
+    """
+    globalTags: GlobalTagsUpdate
 
-   """
-   Update to global tags
-   """
-   globalTags: GlobalTagsUpdate
+    """
+    Update to editable properties
+    """
+    editableProperties: DashboardEditablePropertiesUpdate
 }
 
 input DataFlowUpdateInput {
-   """
-   The dataFlow urn
-   """
-   urn: String!
+    """
+    The dataFlow urn
+    """
+    urn: String!
+
+    """
+    Update to ownership
+    """
+    ownership: OwnershipUpdate
 
-   """
-   Update to ownership
-   """
-   ownership: OwnershipUpdate
+    """
+    Update to global tags
+    """
+    globalTags: GlobalTagsUpdate
 
-   """
-   Update to global tags
-   """
-   globalTags: GlobalTagsUpdate
+    """
+    Update to editable properties
+    """
+    editableProperties: DataFlowEditablePropertiesUpdate
 }
 
 input DataJobUpdateInput {
-   """
-   The dataJob urn
-   """
-   urn: String!
+    """
+    The dataJob urn
+    """
+    urn: String!
 
-   """
-   Update to ownership
-   """
-   ownership: OwnershipUpdate
+    """
+    Update to ownership
+    """
+    ownership: OwnershipUpdate
 
-   """
-   Update to global tags
-   """
-   globalTags: GlobalTagsUpdate
+    """
+    Update to global tags
+    """
+    globalTags: GlobalTagsUpdate
+
+    """
+    Update to editable properties
+    """
+    editableProperties: DataJobEditablePropertiesUpdate
 }
 
 input DatasetUpdateInput {
@@ -1460,7 +1503,7 @@ input DatasetUpdateInput {
     """
     Update to editable properties
     """
-    editableProperties: EditablePropertiesUpdate
+    editableProperties: DatasetEditablePropertiesUpdate
 }
 
 input EditableSchemaMetadataUpdate {
@@ -1484,7 +1527,7 @@ input EditableSchemaFieldInfoUpdate {
     globalTags: GlobalTagsUpdate
 }
 
-input EditablePropertiesUpdate {
+input DatasetEditablePropertiesUpdate {
     """
     Description
     """
@@ -1493,7 +1536,35 @@ input EditablePropertiesUpdate {
     """
     Tags
     """
-    tags: [String!]
+    globalTags: GlobalTagsUpdate
+}
+
+input ChartEditablePropertiesUpdate {
+    """
+    Description
+    """
+    description: String!
+}
+
+input DashboardEditablePropertiesUpdate {
+    """
+    Description
+    """
+    description: String!
+}
+
+input DataJobEditablePropertiesUpdate {
+    """
+    Description
+    """
+    description: String!
+}
+
+input DataFlowEditablePropertiesUpdate {
+    """
+    Description
+    """
+    description: String!
 }
 
 input GlobalTagsUpdate {
@@ -1635,6 +1706,11 @@ type Dashboard implements EntityWithRelationships & Entity {
     Entities downstream of the given entity
     """
     downstreamLineage: DownstreamEntityRelationships
+
+    """
+    Editable properties
+    """
+    editableProperties: DashboardEditableProperties
 }
 
 type DashboardInfo {
@@ -1756,6 +1832,11 @@ type Chart implements EntityWithRelationships & Entity {
     Entities downstream of the given entity
     """
     downstreamLineage: DownstreamEntityRelationships
+
+    """
+    Editable properties
+    """
+    editableProperties: ChartEditableProperties
 }
 
 type ChartInfo {
@@ -2339,6 +2420,11 @@ type DataFlow implements Entity {
     DataJobs
     """
     dataJobs: DataFlowDataJobsRelationships
+
+    """
+    Editable properties
+    """
+    editableProperties: DataFlowEditableProperties
 }
 
 type DataFlowInfo {
@@ -2424,6 +2510,10 @@ type DataJob implements EntityWithRelationships & Entity {
     """
     status: Status
 
+    """
+    Editable properties
+    """
+    editableProperties: DataJobEditableProperties
 }
 
 type DataJobInfo {
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index 918f724c485cb3..61f5009698c69e 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -526,6 +526,7 @@ export const dataFlow1 = {
         externalUrl: null,
         customProperties: [],
     },
+    editableProperties: null,
     ownership: {
         owners: [
             {
@@ -592,6 +593,7 @@ export const dataJob1 = {
         externalUrl: null,
         customProperties: [],
     },
+    editableProperties: null,
     inputOutput: {
         __typename: 'DataJobInputOutput',
         inputDatasets: [dataset3],
@@ -647,6 +649,7 @@ export const dataJob2 = {
         externalUrl: null,
         customProperties: [],
     },
+    editableProperties: null,
     inputOutput: {
         __typename: 'DataJobInputOutput',
         inputDatasets: [dataset3],
@@ -702,6 +705,7 @@ export const dataJob3 = {
         externalUrl: null,
         customProperties: [],
     },
+    editableProperties: null,
     inputOutput: {
         __typename: 'DataJobInputOutput',
         inputDatasets: [dataset3],
diff --git a/datahub-web-react/src/graphql/chart.graphql b/datahub-web-react/src/graphql/chart.graphql
index 26d63bc9109261..700d4eb2a2d3c7 100644
--- a/datahub-web-react/src/graphql/chart.graphql
+++ b/datahub-web-react/src/graphql/chart.graphql
@@ -61,6 +61,9 @@ query getChart($urn: String!) {
         upstreamLineage {
             ...upstreamRelationshipFields
         }
+        editableProperties {
+            description
+        }
     }
 }
 
@@ -115,6 +118,9 @@ mutation updateChart($input: ChartUpdateInput!) {
             rawQuery
             type
         }
+        editableProperties {
+            description
+        }
         ownership {
             ...ownershipFields
         }
diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
index df86b6fa0e0c02..de96085e1cae25 100644
--- a/datahub-web-react/src/graphql/dataset.graphql
+++ b/datahub-web-react/src/graphql/dataset.graphql
@@ -32,7 +32,9 @@ query getDataset($urn: String!) {
         }
         editableProperties {
             description
-            tags
+            globalTags {
+                ...globalTagsFields
+            }
         }
         ownership {
             ...ownershipFields
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index e90a5a6a39468f..42ac8b0743be82 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -112,7 +112,9 @@ fragment nonRecursiveDatasetFields on Dataset {
     }
     editableProperties {
         description
-        tags
+        globalTags {
+            ...globalTagsFields
+        }
     }
     ownership {
         ...ownershipFields
@@ -202,6 +204,9 @@ fragment nonRecursiveDataFlowFields on DataFlow {
             value
         }
     }
+    editableProperties {
+        description
+    }
     ownership {
         ...ownershipFields
     }
@@ -253,6 +258,9 @@ fragment dataJobFields on DataJob {
             value
         }
     }
+    editableProperties {
+        description
+    }
     globalTags {
         ...globalTagsFields
     }
@@ -295,6 +303,9 @@ fragment dashboardFields on Dashboard {
             time
         }
     }
+    editableProperties {
+        description
+    }
     ownership {
         ...ownershipFields
     }
diff --git a/gms/api/src/main/pegasus/com/linkedin/dashboard/Chart.pdl b/gms/api/src/main/pegasus/com/linkedin/dashboard/Chart.pdl
index 7536f45e14a2ca..6ee4a584cb40e5 100644
--- a/gms/api/src/main/pegasus/com/linkedin/dashboard/Chart.pdl
+++ b/gms/api/src/main/pegasus/com/linkedin/dashboard/Chart.pdl
@@ -3,6 +3,7 @@ namespace com.linkedin.dashboard
 import com.linkedin.common.ChartUrn
 import com.linkedin.chart.ChartInfo
 import com.linkedin.chart.ChartQuery
+import com.linkedin.chart.EditableChartProperties
 import com.linkedin.common.Ownership
 import com.linkedin.common.Status
 import com.linkedin.common.GlobalTags
@@ -41,4 +42,9 @@ record Chart includes ChartKey {
    * List of global tags applied to the chart
    */
   globalTags: optional GlobalTags
+
+  /**
+   * Editable properties
+   */
+  editableProperties: optional EditableChartProperties
 }
\ No newline at end of file
diff --git a/gms/api/src/main/pegasus/com/linkedin/dashboard/Dashboard.pdl b/gms/api/src/main/pegasus/com/linkedin/dashboard/Dashboard.pdl
index 005bb98129a135..b6d0c96a9d4ed1 100644
--- a/gms/api/src/main/pegasus/com/linkedin/dashboard/Dashboard.pdl
+++ b/gms/api/src/main/pegasus/com/linkedin/dashboard/Dashboard.pdl
@@ -34,4 +34,9 @@ record Dashboard includes DashboardKey {
    * List of global tags applied to the dashboard
    */
   globalTags: optional GlobalTags
+
+  /**
+   * Editable properties
+   */
+  editableProperties: optional EditableDashboardProperties
 }
\ No newline at end of file
diff --git a/gms/api/src/main/pegasus/com/linkedin/datajob/DataFlow.pdl b/gms/api/src/main/pegasus/com/linkedin/datajob/DataFlow.pdl
index 51871c41f2ebf7..59b9887605649b 100644
--- a/gms/api/src/main/pegasus/com/linkedin/datajob/DataFlow.pdl
+++ b/gms/api/src/main/pegasus/com/linkedin/datajob/DataFlow.pdl
@@ -34,4 +34,9 @@ record DataFlow includes DataFlowKey, ChangeAuditStamps {
    * List of global tags applied to the chart
    */
   globalTags: optional GlobalTags
+
+  /**
+   * Editable properties
+   */
+  editableProperties: optional EditableDataflowProperties
 }
diff --git a/gms/api/src/main/pegasus/com/linkedin/datajob/DataJob.pdl b/gms/api/src/main/pegasus/com/linkedin/datajob/DataJob.pdl
index 487eaa0ee23d57..b1ccf7abcd9a35 100644
--- a/gms/api/src/main/pegasus/com/linkedin/datajob/DataJob.pdl
+++ b/gms/api/src/main/pegasus/com/linkedin/datajob/DataJob.pdl
@@ -39,4 +39,9 @@ record DataJob includes DataJobKey, ChangeAuditStamps {
    * List of global tags applied to the chart
    */
   globalTags: optional GlobalTags
+
+  /**
+   * Editable properties
+   */
+  editableProperties: optional EditableDatajobProperties
 }
diff --git a/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
index 0543e176f8867e..b291bbafecb97d 100644
--- a/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.chart.charts.snapshot.json
@@ -158,7 +158,13 @@
         "items" : "ChartDataSourceType"
       },
       "doc" : "Data sources for the chart",
-      "optional" : true
+      "optional" : true,
+      "Relationship" : {
+        "/*/string" : {
+          "entityTypes" : [ "dataset" ],
+          "name" : "Consumes"
+        }
+      }
     }, {
       "name" : "type",
       "type" : {
@@ -237,7 +243,21 @@
     "Aspect" : {
       "name" : "chartQuery"
     }
-  }, "com.linkedin.chart.ChartQueryType", "com.linkedin.chart.ChartType", "com.linkedin.common.AccessLevel", "com.linkedin.common.AuditStamp", {
+  }, "com.linkedin.chart.ChartQueryType", "com.linkedin.chart.ChartType", {
+    "type" : "record",
+    "name" : "EditableChartProperties",
+    "namespace" : "com.linkedin.chart",
+    "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+    "fields" : [ {
+      "name" : "description",
+      "type" : "string",
+      "optional" : true
+    } ],
+    "Aspect" : {
+      "name" : "editableChartProperties"
+    }
+  }, "com.linkedin.common.AccessLevel", "com.linkedin.common.AuditStamp", {
     "type" : "record",
     "name" : "BrowsePaths",
     "namespace" : "com.linkedin.common",
@@ -516,6 +536,11 @@
       "type" : "com.linkedin.common.GlobalTags",
       "doc" : "List of global tags applied to the chart",
       "optional" : true
+    }, {
+      "name" : "editableProperties",
+      "type" : "com.linkedin.chart.EditableChartProperties",
+      "doc" : "Editable properties",
+      "optional" : true
     } ]
   }, "com.linkedin.dashboard.ChartKey", {
     "type" : "typeref",
@@ -545,7 +570,7 @@
       "Aspect" : {
         "name" : "chartKey"
       }
-    }, "com.linkedin.chart.ChartInfo", "com.linkedin.chart.ChartQuery", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+    }, "com.linkedin.chart.ChartInfo", "com.linkedin.chart.ChartQuery", "com.linkedin.chart.EditableChartProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
   }, "com.linkedin.metadata.key.ChartKey", {
     "type" : "record",
     "name" : "AggregationMetadata",
diff --git a/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
index 0f95ed3813bb15..c217b6acbb4a04 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dashboard.dashboards.snapshot.json
@@ -462,8 +462,26 @@
       "type" : "com.linkedin.common.GlobalTags",
       "doc" : "List of global tags applied to the dashboard",
       "optional" : true
+    }, {
+      "name" : "editableProperties",
+      "type" : {
+        "type" : "record",
+        "name" : "EditableDashboardProperties",
+        "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+        "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+        "fields" : [ {
+          "name" : "description",
+          "type" : "string",
+          "optional" : true
+        } ],
+        "Aspect" : {
+          "name" : "editableDashboardProperties"
+        }
+      },
+      "doc" : "Editable properties",
+      "optional" : true
     } ]
-  }, "com.linkedin.dashboard.DashboardInfo", "com.linkedin.dashboard.DashboardKey", {
+  }, "com.linkedin.dashboard.DashboardInfo", "com.linkedin.dashboard.DashboardKey", "com.linkedin.dashboard.EditableDashboardProperties", {
     "type" : "typeref",
     "name" : "DashboardAspect",
     "namespace" : "com.linkedin.metadata.aspect",
@@ -491,7 +509,7 @@
       "Aspect" : {
         "name" : "dashboardKey"
       }
-    }, "com.linkedin.dashboard.DashboardInfo", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+    }, "com.linkedin.dashboard.DashboardInfo", "com.linkedin.dashboard.EditableDashboardProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
   }, "com.linkedin.metadata.key.DashboardKey", {
     "type" : "record",
     "name" : "AggregationMetadata",
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
index 7c11c6043e919a..0c245c29cefc34 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
@@ -407,8 +407,26 @@
       "type" : "com.linkedin.common.GlobalTags",
       "doc" : "List of global tags applied to the chart",
       "optional" : true
+    }, {
+      "name" : "editableProperties",
+      "type" : {
+        "type" : "record",
+        "name" : "EditableDataflowProperties",
+        "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+        "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+        "fields" : [ {
+          "name" : "description",
+          "type" : "string",
+          "optional" : true
+        } ],
+        "Aspect" : {
+          "name" : "editableDataflowProperties"
+        }
+      },
+      "doc" : "Editable properties",
+      "optional" : true
     } ]
-  }, "com.linkedin.datajob.DataFlowInfo", "com.linkedin.datajob.DataFlowKey", {
+  }, "com.linkedin.datajob.DataFlowInfo", "com.linkedin.datajob.DataFlowKey", "com.linkedin.datajob.EditableDataflowProperties", {
     "type" : "typeref",
     "name" : "DataFlowAspect",
     "namespace" : "com.linkedin.metadata.aspect",
diff --git a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
index 4dda76d5d48b6d..baf02798462898 100644
--- a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
@@ -549,8 +549,40 @@
       "type" : "com.linkedin.common.GlobalTags",
       "doc" : "List of global tags applied to the chart",
       "optional" : true
+    }, {
+      "name" : "editableProperties",
+      "type" : {
+        "type" : "record",
+        "name" : "EditableDatajobProperties",
+        "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+        "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+        "fields" : [ {
+          "name" : "description",
+          "type" : "string",
+          "optional" : true
+        } ],
+        "Aspect" : {
+          "name" : "editableDatajobProperties"
+        }
+      },
+      "doc" : "Editable properties",
+      "optional" : true
     } ]
-  }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.DataJobKey", "com.linkedin.datajob.azkaban.AzkabanJobType", {
+  }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.DataJobKey", {
+    "type" : "record",
+    "name" : "EditableDataflowProperties",
+    "namespace" : "com.linkedin.datajob",
+    "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+    "fields" : [ {
+      "name" : "description",
+      "type" : "string",
+      "optional" : true
+    } ],
+    "Aspect" : {
+      "name" : "editableDataflowProperties"
+    }
+  }, "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.datajob.azkaban.AzkabanJobType", {
     "type" : "typeref",
     "name" : "DataJobAspect",
     "namespace" : "com.linkedin.metadata.aspect",
@@ -585,7 +617,7 @@
       "Aspect" : {
         "name" : "dataJobKey"
       }
-    }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+    }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.EditableDataflowProperties", "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
   }, "com.linkedin.metadata.key.DataJobKey", {
     "type" : "record",
     "name" : "AggregationMetadata",
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
index 1a61a3bc998b5d..31681d3df152ab 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
@@ -613,13 +613,10 @@
           "doc" : "Documentation of the dataset",
           "optional" : true
         }, {
-          "name" : "tags",
-          "type" : {
-            "type" : "array",
-            "items" : "string"
-          },
-          "doc" : "[Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.",
-          "default" : [ ]
+          "name" : "globalTags",
+          "type" : "com.linkedin.common.GlobalTags",
+          "doc" : "globalTags",
+          "optional" : true
         } ],
         "Aspect" : {
           "name" : "editableDatasetProperties"
diff --git a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index a0c33dea372ac8..18e08dcf9a76a3 100644
--- a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -158,7 +158,13 @@
         "items" : "ChartDataSourceType"
       },
       "doc" : "Data sources for the chart",
-      "optional" : true
+      "optional" : true,
+      "Relationship" : {
+        "/*/string" : {
+          "entityTypes" : [ "dataset" ],
+          "name" : "Consumes"
+        }
+      }
     }, {
       "name" : "type",
       "type" : {
@@ -237,7 +243,21 @@
     "Aspect" : {
       "name" : "chartQuery"
     }
-  }, "com.linkedin.chart.ChartQueryType", "com.linkedin.chart.ChartType", "com.linkedin.common.AccessLevel", "com.linkedin.common.AuditStamp", {
+  }, "com.linkedin.chart.ChartQueryType", "com.linkedin.chart.ChartType", {
+    "type" : "record",
+    "name" : "EditableChartProperties",
+    "namespace" : "com.linkedin.chart",
+    "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+    "fields" : [ {
+      "name" : "description",
+      "type" : "string",
+      "optional" : true
+    } ],
+    "Aspect" : {
+      "name" : "editableChartProperties"
+    }
+  }, "com.linkedin.common.AccessLevel", "com.linkedin.common.AuditStamp", {
     "type" : "record",
     "name" : "BaseFieldMapping",
     "namespace" : "com.linkedin.common",
@@ -1119,6 +1139,20 @@
     "Aspect" : {
       "name" : "dashboardInfo"
     }
+  }, {
+    "type" : "record",
+    "name" : "EditableDashboardProperties",
+    "namespace" : "com.linkedin.dashboard",
+    "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+    "fields" : [ {
+      "name" : "description",
+      "type" : "string",
+      "optional" : true
+    } ],
+    "Aspect" : {
+      "name" : "editableDashboardProperties"
+    }
   }, {
     "type" : "record",
     "name" : "DataFlowInfo",
@@ -1276,6 +1310,34 @@
     "Aspect" : {
       "name" : "dataJobInputOutput"
     }
+  }, {
+    "type" : "record",
+    "name" : "EditableDataflowProperties",
+    "namespace" : "com.linkedin.datajob",
+    "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+    "fields" : [ {
+      "name" : "description",
+      "type" : "string",
+      "optional" : true
+    } ],
+    "Aspect" : {
+      "name" : "editableDataflowProperties"
+    }
+  }, {
+    "type" : "record",
+    "name" : "EditableDatajobProperties",
+    "namespace" : "com.linkedin.datajob",
+    "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
+    "fields" : [ {
+      "name" : "description",
+      "type" : "string",
+      "optional" : true
+    } ],
+    "Aspect" : {
+      "name" : "editableDatajobProperties"
+    }
   }, "com.linkedin.datajob.azkaban.AzkabanJobType", {
     "type" : "record",
     "name" : "DataPlatformInfo",
@@ -1508,13 +1570,10 @@
       "doc" : "Documentation of the dataset",
       "optional" : true
     }, {
-      "name" : "tags",
-      "type" : {
-        "type" : "array",
-        "items" : "string"
-      },
-      "doc" : "[Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.",
-      "default" : [ ]
+      "name" : "globalTags",
+      "type" : "com.linkedin.common.GlobalTags",
+      "doc" : "globalTags",
+      "optional" : true
     } ],
     "Aspect" : {
       "name" : "editableDatasetProperties"
@@ -1619,7 +1678,7 @@
                   "Aspect" : {
                     "name" : "chartKey"
                   }
-                }, "com.linkedin.chart.ChartInfo", "com.linkedin.chart.ChartQuery", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+                }, "com.linkedin.chart.ChartInfo", "com.linkedin.chart.ChartQuery", "com.linkedin.chart.EditableChartProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
               }
             },
             "doc" : "The list of metadata aspects associated with the chart. Depending on the use case, this can either be all, or a selection, of supported aspects."
@@ -1942,7 +2001,7 @@
                   "Aspect" : {
                     "name" : "dashboardKey"
                   }
-                }, "com.linkedin.dashboard.DashboardInfo", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+                }, "com.linkedin.dashboard.DashboardInfo", "com.linkedin.dashboard.EditableDashboardProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
               }
             },
             "doc" : "The list of metadata aspects associated with the dashboard. Depending on the use case, this can either be all, or a selection, of supported aspects."
@@ -2055,7 +2114,7 @@
                   "Aspect" : {
                     "name" : "dataJobKey"
                   }
-                }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+                }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.EditableDataflowProperties", "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
               }
             },
             "doc" : "The list of metadata aspects associated with the data job. Depending on the use case, this can either be all, or a selection, of supported aspects."
diff --git a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py
index 3e537f7ffdc320..34b49df5710711 100644
--- a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py
+++ b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py
@@ -2,9 +2,11 @@
 from .....schema_classes import ChartQueryClass
 from .....schema_classes import ChartQueryTypeClass
 from .....schema_classes import ChartTypeClass
+from .....schema_classes import EditableChartPropertiesClass
 
 
 ChartInfo = ChartInfoClass
 ChartQuery = ChartQueryClass
 ChartQueryType = ChartQueryTypeClass
 ChartType = ChartTypeClass
+EditableChartProperties = EditableChartPropertiesClass
diff --git a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dashboard/__init__.py b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dashboard/__init__.py
index c7a50acf41a7b0..19979a46940cf6 100644
--- a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dashboard/__init__.py
+++ b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/dashboard/__init__.py
@@ -1,4 +1,6 @@
 from .....schema_classes import DashboardInfoClass
+from .....schema_classes import EditableDashboardPropertiesClass
 
 
 DashboardInfo = DashboardInfoClass
+EditableDashboardProperties = EditableDashboardPropertiesClass
diff --git a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/datajob/__init__.py b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/datajob/__init__.py
index 3d3f8457459d30..f29e6a6339072d 100644
--- a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/datajob/__init__.py
+++ b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/datajob/__init__.py
@@ -1,8 +1,12 @@
 from .....schema_classes import DataFlowInfoClass
 from .....schema_classes import DataJobInfoClass
 from .....schema_classes import DataJobInputOutputClass
+from .....schema_classes import EditableDataflowPropertiesClass
+from .....schema_classes import EditableDatajobPropertiesClass
 
 
 DataFlowInfo = DataFlowInfoClass
 DataJobInfo = DataJobInfoClass
 DataJobInputOutput = DataJobInputOutputClass
+EditableDataflowProperties = EditableDataflowPropertiesClass
+EditableDatajobProperties = EditableDatajobPropertiesClass
diff --git a/metadata-ingestion/src/datahub/metadata/schema.avsc b/metadata-ingestion/src/datahub/metadata/schema.avsc
index 5ea752a69e8edd..212d276ac0d648 100644
--- a/metadata-ingestion/src/datahub/metadata/schema.avsc
+++ b/metadata-ingestion/src/datahub/metadata/schema.avsc
@@ -392,6 +392,44 @@
                       "name": "chartQuery"
                     }
                   },
+                  {
+                    "type": "record",
+                    "name": "EditableChartProperties",
+                    "namespace": "com.linkedin.pegasus2avro.chart",
+                    "doc": "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+                    "fields": [
+                      {
+                        "name": "created",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the creation of this resource/association/sub-resource"
+                      },
+                      {
+                        "name": "lastModified",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"
+                      },
+                      {
+                        "name": "deleted",
+                        "type": [
+                          "null",
+                          "com.linkedin.pegasus2avro.common.AuditStamp"
+                        ],
+                        "doc": "An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics.",
+                        "default": null
+                      },
+                      {
+                        "name": "description",
+                        "type": [
+                          "null",
+                          "string"
+                        ],
+                        "default": null
+                      }
+                    ],
+                    "Aspect": {
+                      "name": "editableChartProperties"
+                    }
+                  },
                   {
                     "type": "record",
                     "name": "Ownership",
@@ -1134,6 +1172,44 @@
                       "name": "dashboardInfo"
                     }
                   },
+                  {
+                    "type": "record",
+                    "name": "EditableDashboardProperties",
+                    "namespace": "com.linkedin.pegasus2avro.dashboard",
+                    "doc": "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+                    "fields": [
+                      {
+                        "name": "created",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the creation of this resource/association/sub-resource"
+                      },
+                      {
+                        "name": "lastModified",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"
+                      },
+                      {
+                        "name": "deleted",
+                        "type": [
+                          "null",
+                          "com.linkedin.pegasus2avro.common.AuditStamp"
+                        ],
+                        "doc": "An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics.",
+                        "default": null
+                      },
+                      {
+                        "name": "description",
+                        "type": [
+                          "null",
+                          "string"
+                        ],
+                        "default": null
+                      }
+                    ],
+                    "Aspect": {
+                      "name": "editableDashboardProperties"
+                    }
+                  },
                   "com.linkedin.pegasus2avro.common.Ownership",
                   "com.linkedin.pegasus2avro.common.Status",
                   "com.linkedin.pegasus2avro.common.GlobalTags",
@@ -1525,6 +1601,82 @@
                       "name": "dataJobInputOutput"
                     }
                   },
+                  {
+                    "type": "record",
+                    "name": "EditableDataflowProperties",
+                    "namespace": "com.linkedin.pegasus2avro.datajob",
+                    "doc": "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+                    "fields": [
+                      {
+                        "name": "created",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the creation of this resource/association/sub-resource"
+                      },
+                      {
+                        "name": "lastModified",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"
+                      },
+                      {
+                        "name": "deleted",
+                        "type": [
+                          "null",
+                          "com.linkedin.pegasus2avro.common.AuditStamp"
+                        ],
+                        "doc": "An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics.",
+                        "default": null
+                      },
+                      {
+                        "name": "description",
+                        "type": [
+                          "null",
+                          "string"
+                        ],
+                        "default": null
+                      }
+                    ],
+                    "Aspect": {
+                      "name": "editableDataflowProperties"
+                    }
+                  },
+                  {
+                    "type": "record",
+                    "name": "EditableDatajobProperties",
+                    "namespace": "com.linkedin.pegasus2avro.datajob",
+                    "doc": "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+                    "fields": [
+                      {
+                        "name": "created",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the creation of this resource/association/sub-resource"
+                      },
+                      {
+                        "name": "lastModified",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"
+                      },
+                      {
+                        "name": "deleted",
+                        "type": [
+                          "null",
+                          "com.linkedin.pegasus2avro.common.AuditStamp"
+                        ],
+                        "doc": "An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics.",
+                        "default": null
+                      },
+                      {
+                        "name": "description",
+                        "type": [
+                          "null",
+                          "string"
+                        ],
+                        "default": null
+                      }
+                    ],
+                    "Aspect": {
+                      "name": "editableDatajobProperties"
+                    }
+                  },
                   "com.linkedin.pegasus2avro.common.Ownership",
                   "com.linkedin.pegasus2avro.common.Status",
                   "com.linkedin.pegasus2avro.common.GlobalTags",
@@ -1719,13 +1871,13 @@
                         "default": null
                       },
                       {
-                        "name": "tags",
-                        "type": {
-                          "type": "array",
-                          "items": "string"
-                        },
-                        "doc": "[Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.",
-                        "default": []
+                        "name": "globalTags",
+                        "type": [
+                          "null",
+                          "com.linkedin.pegasus2avro.common.GlobalTags"
+                        ],
+                        "doc": "globalTags",
+                        "default": null
                       }
                     ],
                     "Aspect": {
diff --git a/metadata-ingestion/src/datahub/metadata/schema_classes.py b/metadata-ingestion/src/datahub/metadata/schema_classes.py
index 67dffaab3a0ee9..a767a95424648e 100644
--- a/metadata-ingestion/src/datahub/metadata/schema_classes.py
+++ b/metadata-ingestion/src/datahub/metadata/schema_classes.py
@@ -435,6 +435,86 @@ class ChartTypeClass(object):
     BOX_PLOT = "BOX_PLOT"
     
     
+class EditableChartPropertiesClass(DictWrapper):
+    """Stores editable changes made to properties. This separates changes made from
+    ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines"""
+    
+    RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.chart.EditableChartProperties")
+    def __init__(self,
+        created: "AuditStampClass",
+        lastModified: "AuditStampClass",
+        deleted: Union[None, "AuditStampClass"]=None,
+        description: Union[None, str]=None,
+    ):
+        super().__init__()
+        
+        self.created = created
+        self.lastModified = lastModified
+        self.deleted = deleted
+        self.description = description
+    
+    @classmethod
+    def construct_with_defaults(cls) -> "EditableChartPropertiesClass":
+        self = cls.construct({})
+        self._restore_defaults()
+        
+        return self
+    
+    def _restore_defaults(self) -> None:
+        self.created = AuditStampClass.construct_with_defaults()
+        self.lastModified = AuditStampClass.construct_with_defaults()
+        self.deleted = self.RECORD_SCHEMA.field_map["deleted"].default
+        self.description = self.RECORD_SCHEMA.field_map["description"].default
+    
+    
+    @property
+    def created(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        return self._inner_dict.get('created')  # type: ignore
+    
+    
+    @created.setter
+    def created(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        self._inner_dict['created'] = value
+    
+    
+    @property
+    def lastModified(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        return self._inner_dict.get('lastModified')  # type: ignore
+    
+    
+    @lastModified.setter
+    def lastModified(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        self._inner_dict['lastModified'] = value
+    
+    
+    @property
+    def deleted(self) -> Union[None, "AuditStampClass"]:
+        """Getter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        return self._inner_dict.get('deleted')  # type: ignore
+    
+    
+    @deleted.setter
+    def deleted(self, value: Union[None, "AuditStampClass"]) -> None:
+        """Setter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        self._inner_dict['deleted'] = value
+    
+    
+    @property
+    def description(self) -> Union[None, str]:
+        # No docs available.
+        return self._inner_dict.get('description')  # type: ignore
+    
+    
+    @description.setter
+    def description(self, value: Union[None, str]) -> None:
+        # No docs available.
+        self._inner_dict['description'] = value
+    
+    
 class AccessLevelClass(object):
     """The various access levels"""
     
@@ -1640,6 +1720,86 @@ def lastRefreshed(self, value: Union[None, int]) -> None:
         self._inner_dict['lastRefreshed'] = value
     
     
+class EditableDashboardPropertiesClass(DictWrapper):
+    """Stores editable changes made to properties. This separates changes made from
+    ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines"""
+    
+    RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.dashboard.EditableDashboardProperties")
+    def __init__(self,
+        created: "AuditStampClass",
+        lastModified: "AuditStampClass",
+        deleted: Union[None, "AuditStampClass"]=None,
+        description: Union[None, str]=None,
+    ):
+        super().__init__()
+        
+        self.created = created
+        self.lastModified = lastModified
+        self.deleted = deleted
+        self.description = description
+    
+    @classmethod
+    def construct_with_defaults(cls) -> "EditableDashboardPropertiesClass":
+        self = cls.construct({})
+        self._restore_defaults()
+        
+        return self
+    
+    def _restore_defaults(self) -> None:
+        self.created = AuditStampClass.construct_with_defaults()
+        self.lastModified = AuditStampClass.construct_with_defaults()
+        self.deleted = self.RECORD_SCHEMA.field_map["deleted"].default
+        self.description = self.RECORD_SCHEMA.field_map["description"].default
+    
+    
+    @property
+    def created(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        return self._inner_dict.get('created')  # type: ignore
+    
+    
+    @created.setter
+    def created(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        self._inner_dict['created'] = value
+    
+    
+    @property
+    def lastModified(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        return self._inner_dict.get('lastModified')  # type: ignore
+    
+    
+    @lastModified.setter
+    def lastModified(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        self._inner_dict['lastModified'] = value
+    
+    
+    @property
+    def deleted(self) -> Union[None, "AuditStampClass"]:
+        """Getter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        return self._inner_dict.get('deleted')  # type: ignore
+    
+    
+    @deleted.setter
+    def deleted(self, value: Union[None, "AuditStampClass"]) -> None:
+        """Setter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        self._inner_dict['deleted'] = value
+    
+    
+    @property
+    def description(self) -> Union[None, str]:
+        # No docs available.
+        return self._inner_dict.get('description')  # type: ignore
+    
+    
+    @description.setter
+    def description(self, value: Union[None, str]) -> None:
+        # No docs available.
+        self._inner_dict['description'] = value
+    
+    
 class DataFlowInfoClass(DictWrapper):
     """Information about a Data processing flow"""
     
@@ -1913,6 +2073,166 @@ def inputDatajobs(self, value: Union[None, List[str]]) -> None:
         self._inner_dict['inputDatajobs'] = value
     
     
+class EditableDataflowPropertiesClass(DictWrapper):
+    """Stores editable changes made to properties. This separates changes made from
+    ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines"""
+    
+    RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.datajob.EditableDataflowProperties")
+    def __init__(self,
+        created: "AuditStampClass",
+        lastModified: "AuditStampClass",
+        deleted: Union[None, "AuditStampClass"]=None,
+        description: Union[None, str]=None,
+    ):
+        super().__init__()
+        
+        self.created = created
+        self.lastModified = lastModified
+        self.deleted = deleted
+        self.description = description
+    
+    @classmethod
+    def construct_with_defaults(cls) -> "EditableDataflowPropertiesClass":
+        self = cls.construct({})
+        self._restore_defaults()
+        
+        return self
+    
+    def _restore_defaults(self) -> None:
+        self.created = AuditStampClass.construct_with_defaults()
+        self.lastModified = AuditStampClass.construct_with_defaults()
+        self.deleted = self.RECORD_SCHEMA.field_map["deleted"].default
+        self.description = self.RECORD_SCHEMA.field_map["description"].default
+    
+    
+    @property
+    def created(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        return self._inner_dict.get('created')  # type: ignore
+    
+    
+    @created.setter
+    def created(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        self._inner_dict['created'] = value
+    
+    
+    @property
+    def lastModified(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        return self._inner_dict.get('lastModified')  # type: ignore
+    
+    
+    @lastModified.setter
+    def lastModified(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        self._inner_dict['lastModified'] = value
+    
+    
+    @property
+    def deleted(self) -> Union[None, "AuditStampClass"]:
+        """Getter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        return self._inner_dict.get('deleted')  # type: ignore
+    
+    
+    @deleted.setter
+    def deleted(self, value: Union[None, "AuditStampClass"]) -> None:
+        """Setter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        self._inner_dict['deleted'] = value
+    
+    
+    @property
+    def description(self) -> Union[None, str]:
+        # No docs available.
+        return self._inner_dict.get('description')  # type: ignore
+    
+    
+    @description.setter
+    def description(self, value: Union[None, str]) -> None:
+        # No docs available.
+        self._inner_dict['description'] = value
+    
+    
+class EditableDatajobPropertiesClass(DictWrapper):
+    """Stores editable changes made to properties. This separates changes made from
+    ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines"""
+    
+    RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.datajob.EditableDatajobProperties")
+    def __init__(self,
+        created: "AuditStampClass",
+        lastModified: "AuditStampClass",
+        deleted: Union[None, "AuditStampClass"]=None,
+        description: Union[None, str]=None,
+    ):
+        super().__init__()
+        
+        self.created = created
+        self.lastModified = lastModified
+        self.deleted = deleted
+        self.description = description
+    
+    @classmethod
+    def construct_with_defaults(cls) -> "EditableDatajobPropertiesClass":
+        self = cls.construct({})
+        self._restore_defaults()
+        
+        return self
+    
+    def _restore_defaults(self) -> None:
+        self.created = AuditStampClass.construct_with_defaults()
+        self.lastModified = AuditStampClass.construct_with_defaults()
+        self.deleted = self.RECORD_SCHEMA.field_map["deleted"].default
+        self.description = self.RECORD_SCHEMA.field_map["description"].default
+    
+    
+    @property
+    def created(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        return self._inner_dict.get('created')  # type: ignore
+    
+    
+    @created.setter
+    def created(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the creation of this resource/association/sub-resource"""
+        self._inner_dict['created'] = value
+    
+    
+    @property
+    def lastModified(self) -> "AuditStampClass":
+        """Getter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        return self._inner_dict.get('lastModified')  # type: ignore
+    
+    
+    @lastModified.setter
+    def lastModified(self, value: "AuditStampClass") -> None:
+        """Setter: An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"""
+        self._inner_dict['lastModified'] = value
+    
+    
+    @property
+    def deleted(self) -> Union[None, "AuditStampClass"]:
+        """Getter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        return self._inner_dict.get('deleted')  # type: ignore
+    
+    
+    @deleted.setter
+    def deleted(self, value: Union[None, "AuditStampClass"]) -> None:
+        """Setter: An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics."""
+        self._inner_dict['deleted'] = value
+    
+    
+    @property
+    def description(self) -> Union[None, str]:
+        # No docs available.
+        return self._inner_dict.get('description')  # type: ignore
+    
+    
+    @description.setter
+    def description(self, value: Union[None, str]) -> None:
+        # No docs available.
+        self._inner_dict['description'] = value
+    
+    
 class AzkabanJobTypeClass(object):
     """The various types of support azkaban jobs"""
     
@@ -2430,7 +2750,7 @@ def __init__(self,
         lastModified: "AuditStampClass",
         deleted: Union[None, "AuditStampClass"]=None,
         description: Union[None, str]=None,
-        tags: Optional[List[str]]=None,
+        globalTags: Union[None, "GlobalTagsClass"]=None,
     ):
         super().__init__()
         
@@ -2438,10 +2758,7 @@ def __init__(self,
         self.lastModified = lastModified
         self.deleted = deleted
         self.description = description
-        if tags is None:
-            self.tags = []
-        else:
-            self.tags = tags
+        self.globalTags = globalTags
     
     @classmethod
     def construct_with_defaults(cls) -> "EditableDatasetPropertiesClass":
@@ -2455,7 +2772,7 @@ def _restore_defaults(self) -> None:
         self.lastModified = AuditStampClass.construct_with_defaults()
         self.deleted = self.RECORD_SCHEMA.field_map["deleted"].default
         self.description = self.RECORD_SCHEMA.field_map["description"].default
-        self.tags = list()
+        self.globalTags = self.RECORD_SCHEMA.field_map["globalTags"].default
     
     
     @property
@@ -2507,15 +2824,15 @@ def description(self, value: Union[None, str]) -> None:
     
     
     @property
-    def tags(self) -> List[str]:
-        """Getter: [Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect."""
-        return self._inner_dict.get('tags')  # type: ignore
+    def globalTags(self) -> Union[None, "GlobalTagsClass"]:
+        """Getter: globalTags"""
+        return self._inner_dict.get('globalTags')  # type: ignore
     
     
-    @tags.setter
-    def tags(self, value: List[str]) -> None:
-        """Setter: [Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect."""
-        self._inner_dict['tags'] = value
+    @globalTags.setter
+    def globalTags(self, value: Union[None, "GlobalTagsClass"]) -> None:
+        """Setter: globalTags"""
+        self._inner_dict['globalTags'] = value
     
     
 class UpstreamClass(DictWrapper):
@@ -3890,7 +4207,7 @@ class ChartSnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.ChartSnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["ChartKeyClass", "ChartInfoClass", "ChartQueryClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
+        aspects: List[Union["ChartKeyClass", "ChartInfoClass", "ChartQueryClass", "EditableChartPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
     ):
         super().__init__()
         
@@ -3922,13 +4239,13 @@ def urn(self, value: str) -> None:
     
     
     @property
-    def aspects(self) -> List[Union["ChartKeyClass", "ChartInfoClass", "ChartQueryClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
+    def aspects(self) -> List[Union["ChartKeyClass", "ChartInfoClass", "ChartQueryClass", "EditableChartPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
         """Getter: The list of metadata aspects associated with the chart. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
     
     
     @aspects.setter
-    def aspects(self, value: List[Union["ChartKeyClass", "ChartInfoClass", "ChartQueryClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
+    def aspects(self, value: List[Union["ChartKeyClass", "ChartInfoClass", "ChartQueryClass", "EditableChartPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the chart. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
     
@@ -4037,7 +4354,7 @@ class DashboardSnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.DashboardSnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["DashboardKeyClass", "DashboardInfoClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
+        aspects: List[Union["DashboardKeyClass", "DashboardInfoClass", "EditableDashboardPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
     ):
         super().__init__()
         
@@ -4069,13 +4386,13 @@ def urn(self, value: str) -> None:
     
     
     @property
-    def aspects(self) -> List[Union["DashboardKeyClass", "DashboardInfoClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
+    def aspects(self) -> List[Union["DashboardKeyClass", "DashboardInfoClass", "EditableDashboardPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
         """Getter: The list of metadata aspects associated with the dashboard. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
     
     
     @aspects.setter
-    def aspects(self, value: List[Union["DashboardKeyClass", "DashboardInfoClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
+    def aspects(self, value: List[Union["DashboardKeyClass", "DashboardInfoClass", "EditableDashboardPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the dashboard. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
     
@@ -4135,7 +4452,7 @@ class DataJobSnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
+        aspects: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDataflowPropertiesClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
     ):
         super().__init__()
         
@@ -4167,13 +4484,13 @@ def urn(self, value: str) -> None:
     
     
     @property
-    def aspects(self) -> List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
+    def aspects(self) -> List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDataflowPropertiesClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
         """Getter: The list of metadata aspects associated with the data job. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
     
     
     @aspects.setter
-    def aspects(self, value: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
+    def aspects(self, value: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDataflowPropertiesClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the data job. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
     
@@ -7229,6 +7546,7 @@ def description(self, value: Union[None, str]) -> None:
     'com.linkedin.pegasus2avro.chart.ChartQuery': ChartQueryClass,
     'com.linkedin.pegasus2avro.chart.ChartQueryType': ChartQueryTypeClass,
     'com.linkedin.pegasus2avro.chart.ChartType': ChartTypeClass,
+    'com.linkedin.pegasus2avro.chart.EditableChartProperties': EditableChartPropertiesClass,
     'com.linkedin.pegasus2avro.common.AccessLevel': AccessLevelClass,
     'com.linkedin.pegasus2avro.common.AuditStamp': AuditStampClass,
     'com.linkedin.pegasus2avro.common.BrowsePaths': BrowsePathsClass,
@@ -7256,9 +7574,12 @@ def description(self, value: Union[None, str]) -> None:
     'com.linkedin.pegasus2avro.common.fieldtransformer.TransformationType': TransformationTypeClass,
     'com.linkedin.pegasus2avro.common.fieldtransformer.UDFTransformer': UDFTransformerClass,
     'com.linkedin.pegasus2avro.dashboard.DashboardInfo': DashboardInfoClass,
+    'com.linkedin.pegasus2avro.dashboard.EditableDashboardProperties': EditableDashboardPropertiesClass,
     'com.linkedin.pegasus2avro.datajob.DataFlowInfo': DataFlowInfoClass,
     'com.linkedin.pegasus2avro.datajob.DataJobInfo': DataJobInfoClass,
     'com.linkedin.pegasus2avro.datajob.DataJobInputOutput': DataJobInputOutputClass,
+    'com.linkedin.pegasus2avro.datajob.EditableDataflowProperties': EditableDataflowPropertiesClass,
+    'com.linkedin.pegasus2avro.datajob.EditableDatajobProperties': EditableDatajobPropertiesClass,
     'com.linkedin.pegasus2avro.datajob.azkaban.AzkabanJobType': AzkabanJobTypeClass,
     'com.linkedin.pegasus2avro.dataplatform.DataPlatformInfo': DataPlatformInfoClass,
     'com.linkedin.pegasus2avro.dataplatform.PlatformType': PlatformTypeClass,
@@ -7365,6 +7686,7 @@ def description(self, value: Union[None, str]) -> None:
     'ChartQuery': ChartQueryClass,
     'ChartQueryType': ChartQueryTypeClass,
     'ChartType': ChartTypeClass,
+    'EditableChartProperties': EditableChartPropertiesClass,
     'AccessLevel': AccessLevelClass,
     'AuditStamp': AuditStampClass,
     'BrowsePaths': BrowsePathsClass,
@@ -7392,9 +7714,12 @@ def description(self, value: Union[None, str]) -> None:
     'TransformationType': TransformationTypeClass,
     'UDFTransformer': UDFTransformerClass,
     'DashboardInfo': DashboardInfoClass,
+    'EditableDashboardProperties': EditableDashboardPropertiesClass,
     'DataFlowInfo': DataFlowInfoClass,
     'DataJobInfo': DataJobInfoClass,
     'DataJobInputOutput': DataJobInputOutputClass,
+    'EditableDataflowProperties': EditableDataflowPropertiesClass,
+    'EditableDatajobProperties': EditableDatajobPropertiesClass,
     'AzkabanJobType': AzkabanJobTypeClass,
     'DataPlatformInfo': DataPlatformInfoClass,
     'PlatformType': PlatformTypeClass,
diff --git a/metadata-models/src/main/pegasus/com/linkedin/chart/EditableChartProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/chart/EditableChartProperties.pdl
new file mode 100644
index 00000000000000..0c8f42823cdc15
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/chart/EditableChartProperties.pdl
@@ -0,0 +1,14 @@
+namespace com.linkedin.chart
+
+import com.linkedin.common.ChangeAuditStamps
+
+/**
+ * Stores editable changes made to properties. This separates changes made from
+ * ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines
+ */
+@Aspect = {
+  "name": "editableChartProperties"
+}
+record EditableChartProperties includes ChangeAuditStamps {
+  description: optional string
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dashboard/EditableDashboardProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/dashboard/EditableDashboardProperties.pdl
new file mode 100644
index 00000000000000..23babefab49a0c
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/dashboard/EditableDashboardProperties.pdl
@@ -0,0 +1,14 @@
+namespace com.linkedin.dashboard
+
+import com.linkedin.common.ChangeAuditStamps
+
+/**
+ * Stores editable changes made to properties. This separates changes made from
+ * ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines
+ */
+@Aspect = {
+  "name": "editableDashboardProperties"
+}
+record EditableDashboardProperties includes ChangeAuditStamps {
+  description: optional string
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDataflowProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDataflowProperties.pdl
new file mode 100644
index 00000000000000..2ffed9ad01c102
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDataflowProperties.pdl
@@ -0,0 +1,14 @@
+namespace com.linkedin.datajob
+
+import com.linkedin.common.ChangeAuditStamps
+
+/**
+ * Stores editable changes made to properties. This separates changes made from
+ * ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines
+ */
+@Aspect = {
+  "name": "editableDataflowProperties"
+}
+record EditableDataflowProperties includes ChangeAuditStamps {
+  description: optional string
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDatajobProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDatajobProperties.pdl
new file mode 100644
index 00000000000000..91176fe197518b
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/datajob/EditableDatajobProperties.pdl
@@ -0,0 +1,14 @@
+namespace com.linkedin.datajob
+
+import com.linkedin.common.ChangeAuditStamps
+
+/**
+ * Stores editable changes made to properties. This separates changes made from
+ * ingestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines
+ */
+@Aspect = {
+  "name": "editableDatajobProperties"
+}
+record EditableDatajobProperties includes ChangeAuditStamps {
+  description: optional string
+}
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
index 04b2bb33e3d42c..9773c1cbbdd931 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
@@ -1,6 +1,7 @@
 namespace com.linkedin.dataset
 
 import com.linkedin.common.ChangeAuditStamps
+import com.linkedin.common.GlobalTags
 
 /**
  * EditableDatasetProperties stores editable changes made to dataset properties. This separates changes made from
@@ -16,7 +17,7 @@ record EditableDatasetProperties includes ChangeAuditStamps {
   description: optional string
 
   /**
-   * [Legacy] Unstructured tags for the dataset. Structured tags can be applied via the `GlobalTags` aspect.
+   * globalTags
    */
-  tags: array[string] = [ ]
+  globalTags: optional GlobalTags
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/ChartAspect.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/ChartAspect.pdl
index 875edcdbc31759..662cd363d380b8 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/ChartAspect.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/ChartAspect.pdl
@@ -3,6 +3,7 @@ namespace com.linkedin.metadata.aspect
 import com.linkedin.metadata.key.ChartKey
 import com.linkedin.chart.ChartInfo
 import com.linkedin.chart.ChartQuery
+import com.linkedin.chart.EditableChartProperties
 import com.linkedin.common.Ownership
 import com.linkedin.common.Status
 import com.linkedin.common.GlobalTags
@@ -15,6 +16,7 @@ typeref ChartAspect = union[
     ChartKey,
     ChartInfo,
     ChartQuery,
+    EditableChartProperties,
     Ownership,
     Status,
     GlobalTags,
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DashboardAspect.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DashboardAspect.pdl
index b87d57206356d0..04567eb4deb649 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DashboardAspect.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DashboardAspect.pdl
@@ -2,6 +2,7 @@ namespace com.linkedin.metadata.aspect
 
 import com.linkedin.metadata.key.DashboardKey
 import com.linkedin.dashboard.DashboardInfo
+import com.linkedin.dashboard.EditableDashboardProperties
 import com.linkedin.common.Ownership
 import com.linkedin.common.Status
 import com.linkedin.common.GlobalTags
@@ -13,6 +14,7 @@ import com.linkedin.common.BrowsePaths
 typeref DashboardAspect = union[
     DashboardKey,
     DashboardInfo,
+    EditableDashboardProperties,
     Ownership,
     Status,
     GlobalTags,
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl
index 4e40e23bd6ee5a..f9baa2da5e407f 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl
@@ -3,6 +3,8 @@ namespace com.linkedin.metadata.aspect
 import com.linkedin.metadata.key.DataJobKey
 import com.linkedin.datajob.DataJobInfo
 import com.linkedin.datajob.DataJobInputOutput
+import com.linkedin.datajob.EditableDataflowProperties
+import com.linkedin.datajob.EditableDatajobProperties
 import com.linkedin.common.Ownership
 import com.linkedin.common.Status
 import com.linkedin.common.GlobalTags
@@ -15,6 +17,8 @@ typeref DataJobAspect = union[
     DataJobKey,
     DataJobInfo,
     DataJobInputOutput,
+    EditableDataflowProperties,
+    EditableDatajobProperties,
     Ownership,
     Status,
     GlobalTags,

From e4f27a788f49a883bc2a0593d8feb9bec6f48c45 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Fri, 11 Jun 2021 03:52:12 +0800
Subject: [PATCH 10/21] feat(react): refactor updatabledescription, create
 re-usable common component for all entities

---
 .../app/entity/chart/profile/ChartHeader.tsx  | 44 +++++----
 .../app/entity/chart/profile/ChartProfile.tsx | 12 +--
 .../dashboard/profile/DashboardHeader.tsx     | 35 +++++---
 .../dashboard/profile/DashboardProfile.tsx    |  9 +-
 .../entity/dataset/profile/DatasetHeader.tsx  | 79 ++++------------
 .../entity/dataset/profile/DatasetProfile.tsx | 17 +---
 .../profile/schema/SchemaDescriptionField.tsx |  8 +-
 .../DescriptionModal.tsx}                     |  0
 .../entity/shared/UpdatableDescription.tsx    | 89 +++++++++++++++++++
 9 files changed, 152 insertions(+), 141 deletions(-)
 rename datahub-web-react/src/app/entity/{dataset/profile/modal/UpdateDescriptionModal.tsx => shared/DescriptionModal.tsx} (100%)
 create mode 100644 datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx

diff --git a/datahub-web-react/src/app/entity/chart/profile/ChartHeader.tsx b/datahub-web-react/src/app/entity/chart/profile/ChartHeader.tsx
index ed0d83b05a76d7..9a098eeae791d2 100644
--- a/datahub-web-react/src/app/entity/chart/profile/ChartHeader.tsx
+++ b/datahub-web-react/src/app/entity/chart/profile/ChartHeader.tsx
@@ -1,9 +1,11 @@
 import { Button, Divider, Row, Space, Typography } from 'antd';
 import React from 'react';
-import { AuditStamp, ChartType, Ownership, EntityType } from '../../../../types.generated';
+import { FetchResult, MutationFunctionOptions } from '@apollo/client';
+import { EntityType, Chart } from '../../../../types.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { AvatarsGroup } from '../../../shared/avatar';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
+import UpdatableDescription from '../../shared/UpdatableDescription';
 import analytics, { EventType, EntityActionType } from '../../../analytics';
 
 const styles = {
@@ -11,23 +13,13 @@ const styles = {
 };
 
 export type Props = {
-    urn: string;
-    platform: string;
-    description?: string | null;
-    ownership?: Ownership | null;
-    lastModified?: AuditStamp;
-    externalUrl?: string | null;
-    chartType?: ChartType | null;
+    chart: Chart;
+    updateChart: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
 };
 
 export default function ChartHeader({
-    urn,
-    platform,
-    description,
-    ownership,
-    externalUrl,
-    lastModified,
-    chartType,
+    chart: { urn, type, info, tool, ownership, editableProperties },
+    updateChart,
 }: Props) {
     const entityRegistry = useEntityRegistry();
 
@@ -38,7 +30,7 @@ export default function ChartHeader({
             entityType: EntityType.Chart,
             entityUrn: urn,
         });
-        window.open(externalUrl || undefined, '_blank');
+        window.open(info?.externalUrl || undefined, '_blank');
     };
 
     return (
@@ -46,21 +38,27 @@ export default function ChartHeader({
             <Row justify="space-between">
                 <Space split={<Divider type="vertical" />}>
                     <Typography.Text strong type="secondary">
-                        {chartType ? `${capitalizeFirstLetter(chartType.toLowerCase())} ` : ''}Chart
+                        {info?.type ? `${capitalizeFirstLetter(info?.type.toLowerCase())} ` : ''}Chart
                     </Typography.Text>
                     <Typography.Text strong type="secondary">
-                        {capitalizeFirstLetter(platform.toLowerCase())}
+                        {capitalizeFirstLetter(tool.toLowerCase())}
                     </Typography.Text>
-                    {externalUrl && (
-                        <Button onClick={openExternalUrl}>View in {capitalizeFirstLetter(platform)}</Button>
+                    {info?.externalUrl && (
+                        <Button onClick={openExternalUrl}>View in {capitalizeFirstLetter(tool)}</Button>
                     )}
                 </Space>
             </Row>
-            <Typography.Paragraph>{description}</Typography.Paragraph>
+            <UpdatableDescription
+                updateEntity={updateChart}
+                updatedDescription={editableProperties?.description}
+                originalDescription={info?.description}
+                entityType={type}
+                urn={urn}
+            />
             <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} size="large" />
-            {lastModified && (
+            {info?.lastModified && (
                 <Typography.Text type="secondary">
-                    Last modified at {new Date(lastModified.time).toLocaleDateString('en-US')}
+                    Last modified at {new Date(info?.lastModified.time).toLocaleDateString('en-US')}
                 </Typography.Text>
             )}
         </Space>
diff --git a/datahub-web-react/src/app/entity/chart/profile/ChartProfile.tsx b/datahub-web-react/src/app/entity/chart/profile/ChartProfile.tsx
index 7f5da52fdb59e9..4d22dff8a5283b 100644
--- a/datahub-web-react/src/app/entity/chart/profile/ChartProfile.tsx
+++ b/datahub-web-react/src/app/entity/chart/profile/ChartProfile.tsx
@@ -42,17 +42,7 @@ export default function ChartProfile({ urn }: { urn: string }) {
         return <Alert type="error" message={error?.message || `Entity failed to load for urn ${urn}`} />;
     }
 
-    const getHeader = (chart: Chart) => (
-        <ChartHeader
-            urn={urn}
-            description={chart.info?.description}
-            platform={chart.tool}
-            ownership={chart.ownership}
-            lastModified={chart.info?.lastModified}
-            externalUrl={chart.info?.externalUrl}
-            chartType={chart.info?.type}
-        />
-    );
+    const getHeader = (chart: Chart) => <ChartHeader chart={chart} updateChart={updateChart} />;
 
     const getTabs = ({ ownership, info, downstreamLineage }: Chart) => {
         return [
diff --git a/datahub-web-react/src/app/entity/dashboard/profile/DashboardHeader.tsx b/datahub-web-react/src/app/entity/dashboard/profile/DashboardHeader.tsx
index 3a9c981058e27f..afd476812e8e0f 100644
--- a/datahub-web-react/src/app/entity/dashboard/profile/DashboardHeader.tsx
+++ b/datahub-web-react/src/app/entity/dashboard/profile/DashboardHeader.tsx
@@ -1,9 +1,11 @@
 import { Button, Divider, Row, Space, Typography } from 'antd';
 import React from 'react';
-import { AuditStamp, Ownership, EntityType } from '../../../../types.generated';
+import { FetchResult, MutationFunctionOptions } from '@apollo/client';
+import { EntityType, Dashboard } from '../../../../types.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
 import { AvatarsGroup } from '../../../shared/avatar';
+import UpdatableDescription from '../../shared/UpdatableDescription';
 import analytics, { EventType, EntityActionType } from '../../../analytics';
 
 const styles = {
@@ -11,17 +13,16 @@ const styles = {
 };
 
 export type Props = {
-    urn: string;
-    platform: string;
-    description?: string | null;
-    ownership?: Ownership | null;
-    lastModified?: AuditStamp;
-    externalUrl?: string | null;
+    dashboard: Dashboard;
+    updateDashboard: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
 };
 
-export default function DashboardHeader({ urn, platform, description, ownership, externalUrl, lastModified }: Props) {
+export default function DashboardHeader({
+    dashboard: { urn, type, info, tool, ownership, editableProperties },
+    updateDashboard,
+}: Props) {
     const entityRegistry = useEntityRegistry();
-    const capitalizedPlatform = capitalizeFirstLetter(platform);
+    const capitalizedPlatform = capitalizeFirstLetter(tool);
 
     const openExternalUrl = () => {
         analytics.event({
@@ -30,7 +31,7 @@ export default function DashboardHeader({ urn, platform, description, ownership,
             entityType: EntityType.Dashboard,
             entityUrn: urn,
         });
-        window.open(externalUrl || undefined, '_blank');
+        window.open(info?.externalUrl || undefined, '_blank');
     };
 
     return (
@@ -41,14 +42,20 @@ export default function DashboardHeader({ urn, platform, description, ownership,
                     <Typography.Text strong type="secondary">
                         {capitalizedPlatform}
                     </Typography.Text>
-                    {externalUrl && <Button onClick={openExternalUrl}>View in {capitalizedPlatform}</Button>}
+                    {info?.externalUrl && <Button onClick={openExternalUrl}>View in {capitalizedPlatform}</Button>}
                 </Space>
             </Row>
-            <Typography.Paragraph>{description}</Typography.Paragraph>
+            <UpdatableDescription
+                updateEntity={updateDashboard}
+                updatedDescription={editableProperties?.description}
+                originalDescription={info?.description}
+                entityType={type}
+                urn={urn}
+            />
             <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} size="large" />
-            {lastModified && (
+            {info?.lastModified && (
                 <Typography.Text type="secondary">
-                    Last modified at {new Date(lastModified.time).toLocaleDateString('en-US')}
+                    Last modified at {new Date(info?.lastModified.time).toLocaleDateString('en-US')}
                 </Typography.Text>
             )}
         </Space>
diff --git a/datahub-web-react/src/app/entity/dashboard/profile/DashboardProfile.tsx b/datahub-web-react/src/app/entity/dashboard/profile/DashboardProfile.tsx
index 9af9be15438080..d4142bced5260f 100644
--- a/datahub-web-react/src/app/entity/dashboard/profile/DashboardProfile.tsx
+++ b/datahub-web-react/src/app/entity/dashboard/profile/DashboardProfile.tsx
@@ -47,14 +47,7 @@ export default function DashboardProfile({ urn }: { urn: string }) {
     }
 
     const getHeader = (dashboard: Dashboard) => (
-        <DashboardHeader
-            urn={urn}
-            description={dashboard.info?.description}
-            platform={dashboard.tool}
-            ownership={dashboard.ownership}
-            lastModified={dashboard.info?.lastModified}
-            externalUrl={dashboard.info?.externalUrl}
-        />
+        <DashboardHeader dashboard={dashboard} updateDashboard={updateDashboard} />
     );
 
     const getTabs = ({ ownership, info }: Dashboard) => {
diff --git a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
index bcc30484475a52..9e510f611e8695 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/DatasetHeader.tsx
@@ -1,49 +1,25 @@
-import { Badge, Divider, message, Popover, Space, Tag, Typography } from 'antd';
-import { FetchResult } from '@apollo/client';
-import React, { useState } from 'react';
-import styled from 'styled-components';
+import { Badge, Divider, Popover, Space, Typography } from 'antd';
+import { FetchResult, MutationFunctionOptions } from '@apollo/client';
+import React from 'react';
 import { Dataset } from '../../../../types.generated';
-import { UpdateDatasetMutation } from '../../../../graphql/dataset.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { AvatarsGroup } from '../../../shared/avatar';
 import CompactContext from '../../../shared/CompactContext';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
-import UpdateDescriptionModal from './modal/UpdateDescriptionModal';
-import MarkdownViewer from '../../shared/MarkdownViewer';
-
-const DescriptionText = styled(MarkdownViewer)`
-    ${(props) => (props.isCompact ? 'max-width: 377px;' : '')};
-`;
-
-const AddNewDescription = styled(Tag)`
-    cursor: pointer;
-`;
-
-const MessageKey = 'AddDatasetDescription';
+import UpdatableDescription from '../../shared/UpdatableDescription';
 
 export type Props = {
     dataset: Dataset;
-    updateDescription: (
-        description: string | null,
-    ) => Promise<FetchResult<UpdateDatasetMutation, Record<string, any>, Record<string, any>>>;
+    updateDataset: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
 };
 
 export default function DatasetHeader({
-    dataset: { description: originalDesc, ownership, deprecation, platform, editableProperties },
-    updateDescription,
+    dataset: { urn, type, description: originalDesc, ownership, deprecation, platform, editableProperties },
+    updateDataset,
 }: Props) {
     const entityRegistry = useEntityRegistry();
     const isCompact = React.useContext(CompactContext);
     const platformName = capitalizeFirstLetter(platform.name);
-    const [showAddDescModal, setShowAddDescModal] = useState(false);
-    const updatedDesc = editableProperties?.description;
-
-    const onUpdateSubmit = async (desc: string | null) => {
-        message.loading({ content: 'Updating...', key: MessageKey });
-        await updateDescription(desc);
-        message.success({ content: 'Updated!', key: MessageKey, duration: 2 });
-        setShowAddDescModal(false);
-    };
 
     return (
         <>
@@ -52,39 +28,14 @@ export default function DatasetHeader({
                     <Typography.Text>Dataset</Typography.Text>
                     <Typography.Text strong>{platformName}</Typography.Text>
                 </Space>
-                {updatedDesc || originalDesc ? (
-                    <>
-                        <DescriptionText
-                            isCompact={isCompact}
-                            source={updatedDesc || originalDesc || ''}
-                            editable
-                            onEditClicked={() => setShowAddDescModal(true)}
-                        />
-                        {showAddDescModal && (
-                            <UpdateDescriptionModal
-                                title="Update description"
-                                onClose={() => setShowAddDescModal(false)}
-                                onSubmit={onUpdateSubmit}
-                                original={originalDesc || ''}
-                                description={updatedDesc || ''}
-                            />
-                        )}
-                    </>
-                ) : (
-                    <>
-                        <AddNewDescription color="success" onClick={() => setShowAddDescModal(true)}>
-                            + Add Description
-                        </AddNewDescription>
-                        {showAddDescModal && (
-                            <UpdateDescriptionModal
-                                title="Add description"
-                                onClose={() => setShowAddDescModal(false)}
-                                onSubmit={onUpdateSubmit}
-                                isAddDesc
-                            />
-                        )}
-                    </>
-                )}
+                <UpdatableDescription
+                    isCompact={isCompact}
+                    updateEntity={updateDataset}
+                    updatedDescription={editableProperties?.description}
+                    originalDescription={originalDesc}
+                    urn={urn}
+                    entityType={type}
+                />
                 <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} size="large" />
                 <div>
                     {deprecation?.deprecated && (
diff --git a/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx b/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
index dbfba24ba9696d..31597c0d0993b5 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/DatasetProfile.tsx
@@ -58,22 +58,7 @@ export const DatasetProfile = ({ urn }: { urn: string }): JSX.Element => {
         return <Alert type="error" message={error?.message || `Entity failed to load for urn ${urn}`} />;
     }
 
-    const getHeader = (dataset: Dataset) => (
-        <DatasetHeader
-            dataset={dataset}
-            updateDescription={(description: string | null) => {
-                analytics.event({
-                    type: EventType.EntityActionEvent,
-                    actionType: EntityActionType.UpdateDescription,
-                    entityType: EntityType.Dataset,
-                    entityUrn: urn,
-                });
-                return updateDataset({
-                    variables: { input: { urn, editableProperties: { description: description || '' } } },
-                });
-            }}
-        />
-    );
+    const getHeader = (dataset: Dataset) => <DatasetHeader dataset={dataset} updateDataset={updateDataset} />;
 
     const getTabs = ({
         ownership,
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
index e9b05f58cb3c34..fd52752b53f94d 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/SchemaDescriptionField.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import { FetchResult } from '@apollo/client';
 
 import { UpdateDatasetMutation } from '../../../../../graphql/dataset.generated';
-import UpdateDescriptionModal from '../modal/UpdateDescriptionModal';
+import UpdateDescriptionModal from '../../../shared/DescriptionModal';
 import MarkdownViewer from '../../../shared/MarkdownViewer';
 
 const DescriptionContainer = styled.div`
@@ -25,8 +25,6 @@ const EditedLabel = styled(Typography.Text)`
     font-style: italic;
 `;
 
-const MessageKey = 'UpdateSchemaDescription';
-
 type Props = {
     description: string;
     updatedDescription?: string | null;
@@ -41,9 +39,9 @@ export default function DescriptionField({ description, updatedDescription, onUp
     const onCloseModal = () => setShowAddModal(false);
 
     const onUpdateModal = async (desc: string | null) => {
-        message.loading({ content: 'Updating...', key: MessageKey });
+        message.loading({ content: 'Updating...' });
         await onUpdate(desc || '');
-        message.success({ content: 'Updated!', key: MessageKey, duration: 2 });
+        message.success({ content: 'Updated!', duration: 2 });
         onCloseModal();
     };
 
diff --git a/datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx b/datahub-web-react/src/app/entity/shared/DescriptionModal.tsx
similarity index 100%
rename from datahub-web-react/src/app/entity/dataset/profile/modal/UpdateDescriptionModal.tsx
rename to datahub-web-react/src/app/entity/shared/DescriptionModal.tsx
diff --git a/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx b/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
new file mode 100644
index 00000000000000..432c397b11be55
--- /dev/null
+++ b/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
@@ -0,0 +1,89 @@
+import { message, Tag } from 'antd';
+import React, { useState } from 'react';
+import { FetchResult, MutationFunctionOptions } from '@apollo/client';
+import styled from 'styled-components';
+import MarkdownViewer from './MarkdownViewer';
+import UpdateDescriptionModal from './DescriptionModal';
+import analytics, { EventType, EntityActionType } from '../../analytics';
+import { EntityType } from '../../../types.generated';
+
+const DescriptionText = styled(MarkdownViewer)`
+    ${(props) => (props.isCompact ? 'max-width: 377px;' : '')};
+`;
+
+const AddNewDescription = styled(Tag)`
+    cursor: pointer;
+`;
+
+export type Props = {
+    isCompact?: boolean;
+    updateEntity: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
+    updatedDescription?: string;
+    originalDescription?: string | null;
+    entityType: EntityType;
+    urn: string;
+};
+
+export default function UpdatableDescription({
+    isCompact,
+    updateEntity,
+    updatedDescription,
+    originalDescription,
+    entityType,
+    urn,
+}: Props) {
+    const [showAddDescModal, setShowAddDescModal] = useState(false);
+    const onSubmit = async (description: string | null) => {
+        message.loading({ content: 'Updating...' });
+        await updateEntity({
+            variables: { input: { urn, editableProperties: { description: description || '' } } },
+        });
+        message.destroy();
+        analytics.event({
+            type: EventType.EntityActionEvent,
+            actionType: EntityActionType.UpdateDescription,
+            entityType,
+            entityUrn: urn,
+        });
+        message.success({ content: 'Updated!', duration: 2 });
+        setShowAddDescModal(false);
+    };
+
+    return (
+        <>
+            {updatedDescription || originalDescription ? (
+                <>
+                    <DescriptionText
+                        isCompact={isCompact}
+                        source={updatedDescription || originalDescription || ''}
+                        editable
+                        onEditClicked={() => setShowAddDescModal(true)}
+                    />
+                    {showAddDescModal && (
+                        <UpdateDescriptionModal
+                            title="Update description"
+                            onClose={() => setShowAddDescModal(false)}
+                            onSubmit={onSubmit}
+                            original={originalDescription || ''}
+                            description={updatedDescription || ''}
+                        />
+                    )}
+                </>
+            ) : (
+                <>
+                    <AddNewDescription color="success" onClick={() => setShowAddDescModal(true)}>
+                        + Add Description
+                    </AddNewDescription>
+                    {showAddDescModal && (
+                        <UpdateDescriptionModal
+                            title="Add description"
+                            onClose={() => setShowAddDescModal(false)}
+                            onSubmit={onSubmit}
+                            isAddDesc
+                        />
+                    )}
+                </>
+            )}
+        </>
+    );
+}

From f4ea7028c2dbf5135d222f7341e28b1906c63aad Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Fri, 11 Jun 2021 03:57:20 +0800
Subject: [PATCH 11/21] feat(react): update datajob, dataflow entities editable
 description

---
 .../entity/dataFlow/profile/DataFlowHeader.tsx   | 16 ++++++++++++++--
 .../entity/dataFlow/profile/DataFlowProfile.tsx  |  2 +-
 .../app/entity/dataJob/profile/DataJobHeader.tsx | 16 ++++++++++++++--
 .../entity/dataJob/profile/DataJobProfile.tsx    |  2 +-
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx b/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx
index 77614c896a31f4..b1a4afe697cef1 100644
--- a/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx
@@ -1,16 +1,22 @@
 import { Button, Divider, Row, Space, Typography } from 'antd';
 import React from 'react';
+import { FetchResult, MutationFunctionOptions } from '@apollo/client';
 import { DataFlow, EntityType } from '../../../../types.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
 import { AvatarsGroup } from '../../../shared/avatar';
+import UpdatableDescription from '../../shared/UpdatableDescription';
 import analytics, { EventType, EntityActionType } from '../../../analytics';
 
 export type Props = {
     dataFlow: DataFlow;
+    updateDataFlow: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
 };
 
-export default function DataFlowHeader({ dataFlow: { urn, ownership, info, orchestrator } }: Props) {
+export default function DataFlowHeader({
+    dataFlow: { urn, type, ownership, info, orchestrator, editableProperties },
+    updateDataFlow,
+}: Props) {
     const entityRegistry = useEntityRegistry();
     const platformName = capitalizeFirstLetter(orchestrator);
 
@@ -34,7 +40,13 @@ export default function DataFlowHeader({ dataFlow: { urn, ownership, info, orche
                         {info?.externalUrl && <Button onClick={openExternalUrl}>View in {platformName}</Button>}
                     </Space>
                 </Row>
-                <Typography.Paragraph>{info?.description}</Typography.Paragraph>
+                <UpdatableDescription
+                    updateEntity={updateDataFlow}
+                    updatedDescription={editableProperties?.description}
+                    originalDescription={info?.description}
+                    entityType={type}
+                    urn={urn}
+                />
                 <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} size="large" />
             </Space>
         </>
diff --git a/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowProfile.tsx b/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowProfile.tsx
index 3e0113338d266d..30bd1a52787d07 100644
--- a/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowProfile.tsx
+++ b/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowProfile.tsx
@@ -47,7 +47,7 @@ export const DataFlowProfile = ({ urn }: { urn: string }): JSX.Element => {
         return <Alert type="error" message={error?.message || 'Entity failed to load'} />;
     }
 
-    const getHeader = (dataFlow: DataFlow) => <DataFlowHeader dataFlow={dataFlow} />;
+    const getHeader = (dataFlow: DataFlow) => <DataFlowHeader dataFlow={dataFlow} updateDataFlow={updateDataFlow} />;
 
     const getTabs = ({ ownership, info, dataJobs }: DataFlow) => {
         return [
diff --git a/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx b/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx
index 5aa31f7ab0643e..c3aa77d8ec8aa5 100644
--- a/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx
@@ -1,11 +1,13 @@
 import { Button, Divider, Row, Space, Typography } from 'antd';
 import React from 'react';
+import { FetchResult, MutationFunctionOptions } from '@apollo/client';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { DataJob, EntityType } from '../../../../types.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
 import { AvatarsGroup } from '../../../shared/avatar';
+import UpdatableDescription from '../../shared/UpdatableDescription';
 import analytics, { EventType, EntityActionType } from '../../../analytics';
 
 const PlatFormLink = styled(Typography.Text)`
@@ -14,9 +16,13 @@ const PlatFormLink = styled(Typography.Text)`
 
 export type Props = {
     dataJob: DataJob;
+    updateDataJob: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
 };
 
-export default function DataJobHeader({ dataJob: { urn, ownership, info, dataFlow } }: Props) {
+export default function DataJobHeader({
+    dataJob: { urn, type, ownership, info, dataFlow, editableProperties },
+    updateDataJob,
+}: Props) {
     const entityRegistry = useEntityRegistry();
     const platformName = dataFlow?.orchestrator ? capitalizeFirstLetter(dataFlow.orchestrator) : '';
 
@@ -53,7 +59,13 @@ export default function DataJobHeader({ dataJob: { urn, ownership, info, dataFlo
                         {info?.externalUrl && <Button onClick={openExternalUrl}>View in {platformName}</Button>}
                     </Space>
                 </Row>
-                <Typography.Paragraph>{info?.description}</Typography.Paragraph>
+                <UpdatableDescription
+                    updateEntity={updateDataJob}
+                    updatedDescription={editableProperties?.description}
+                    originalDescription={info?.description}
+                    entityType={type}
+                    urn={urn}
+                />
                 <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} size="large" />
             </Space>
         </>
diff --git a/datahub-web-react/src/app/entity/dataJob/profile/DataJobProfile.tsx b/datahub-web-react/src/app/entity/dataJob/profile/DataJobProfile.tsx
index df76c3838f7814..84effec324c5ea 100644
--- a/datahub-web-react/src/app/entity/dataJob/profile/DataJobProfile.tsx
+++ b/datahub-web-react/src/app/entity/dataJob/profile/DataJobProfile.tsx
@@ -47,7 +47,7 @@ export const DataJobProfile = ({ urn }: { urn: string }): JSX.Element => {
         return <Alert type="error" message={error?.message || 'Entity failed to load'} />;
     }
 
-    const getHeader = (dataJob: DataJob) => <DataJobHeader dataJob={dataJob} />;
+    const getHeader = (dataJob: DataJob) => <DataJobHeader dataJob={dataJob} updateDataJob={updateDataJob} />;
 
     const getTabs = ({ ownership, info }: DataJob) => {
         return [

From 4bdb4abbfed3524d55f557c74c3a766b0e4db8e4 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Sat, 12 Jun 2021 02:37:53 +0800
Subject: [PATCH 12/21] feat(graphql): update chart, dashboard, datajob,
 dataflow mapper

---
 .../chart/mappers/ChartUpdateInputSnapshotMapper.java     | 7 +++++++
 .../graphql/types/dashboard/mappers/DashboardMapper.java  | 6 ++++++
 .../mappers/DashboardUpdateInputSnapshotMapper.java       | 8 ++++++++
 .../datahub/graphql/types/dataflow/DataFlowType.java      | 4 ++++
 .../datahub/graphql/types/datajob/DataJobType.java        | 1 +
 .../datajob/mappers/DataJobUpdateInputSnapshotMapper.java | 8 ++++++++
 datahub-web-react/src/graphql/dashboard.graphql           | 6 ++++++
 datahub-web-react/src/graphql/fragments.graphql           | 3 ---
 8 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java
index 50e04e370d8a30..4fdf6402f0feeb 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java
@@ -4,6 +4,7 @@
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.ChartUrn;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.chart.EditableChartProperties;
 import com.linkedin.datahub.graphql.generated.ChartUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
@@ -54,6 +55,12 @@ public ChartSnapshot apply(@Nonnull final ChartUpdateInput chartUpdateInput,
             aspects.add(ChartAspect.create(globalTags));
         }
 
+        if (chartUpdateInput.getEditableProperties() != null) {
+            final EditableChartProperties editableChartProperties = new EditableChartProperties();
+            editableChartProperties.setDescription(chartUpdateInput.getEditableProperties().getDescription());
+            aspects.add(ChartAspect.create(editableChartProperties));
+        }
+
         result.setAspects(aspects);
 
         return result;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardMapper.java
index 082017db58636d..da3cca409a9c03 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardMapper.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.graphql.generated.Dashboard;
 import com.linkedin.datahub.graphql.generated.DashboardInfo;
 import com.linkedin.datahub.graphql.generated.EntityType;
+import com.linkedin.datahub.graphql.generated.DashboardEditableProperties;
 import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StringMapMapper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
@@ -42,6 +43,11 @@ public Dashboard apply(@Nonnull final com.linkedin.dashboard.Dashboard dashboard
         if (dashboard.hasGlobalTags()) {
             result.setGlobalTags(GlobalTagsMapper.map(dashboard.getGlobalTags()));
         }
+        if (dashboard.hasEditableProperties()) {
+            final DashboardEditableProperties dashboardEditableProperties = new DashboardEditableProperties();
+            dashboardEditableProperties.setDescription(dashboard.getEditableProperties().getDescription());
+            result.setEditableProperties(dashboardEditableProperties);
+        }
         return result;
     }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java
index 515736b2953bac..d478de0db32fc0 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java
@@ -5,12 +5,14 @@
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.DashboardUrn;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.dashboard.EditableDashboardProperties;
 import com.linkedin.datahub.graphql.generated.DashboardUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.TagAssociationUpdateMapper;
 import com.linkedin.metadata.aspect.DashboardAspect;
 import com.linkedin.metadata.aspect.DashboardAspectArray;
+import com.linkedin.metadata.dao.utils.ModelUtils;
 import com.linkedin.metadata.snapshot.DashboardSnapshot;
 import java.net.URISyntaxException;
 import java.util.stream.Collectors;
@@ -55,6 +57,12 @@ public DashboardSnapshot apply(@Nonnull final DashboardUpdateInput dashboardUpda
             aspects.add(DashboardAspect.create(globalTags));
         }
 
+        if (dashboardUpdateInput.getEditableProperties() != null) {
+            final EditableDashboardProperties editableDashboardProperties = new EditableDashboardProperties();
+            editableDashboardProperties.setDescription(dashboardUpdateInput.getEditableProperties().getDescription());
+            aspects.add(ModelUtils.newAspectUnion(DashboardAspect.class, editableDashboardProperties));
+        }
+
         result.setAspects(aspects);
 
         return result;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
index 92e480cf3ccf62..046cbdbb7d754c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
@@ -170,6 +170,9 @@ protected DataFlowSnapshot toSnapshot(@Nonnull com.linkedin.datajob.DataFlow dat
         if (dataFlow.hasGlobalTags()) {
             aspects.add(ModelUtils.newAspectUnion(DataFlowAspect.class, dataFlow.getGlobalTags()));
         }
+        if (dataFlow.hasEditableProperties()) {
+            aspects.add(ModelUtils.newAspectUnion(DataFlowAspect.class, dataFlow.getEditableProperties()));
+        }
         return ModelUtils.newSnapshot(DataFlowSnapshot.class, urn, aspects);
     }
 
@@ -178,6 +181,7 @@ public DataFlow update(@Nonnull DataFlowUpdateInput input, @Nonnull QueryContext
 
         final CorpuserUrn actor = CorpuserUrn.createFromString(context.getActor());
         final com.linkedin.datajob.DataFlow partialDataFlow = DataFlowUpdateInputMapper.map(input, actor);
+        partialDataFlow.setUrn(DataFlowUrn.createFromString(input.getUrn()));
 
         try {
             Entity entity = new Entity();
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
index 5c3d9822fdd25e..4b0633a5ac2369 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
@@ -183,6 +183,7 @@ public DataJob update(@Nonnull DataJobUpdateInput input, @Nonnull QueryContext c
 
         final CorpuserUrn actor = CorpuserUrn.createFromString(context.getActor());
         final com.linkedin.datajob.DataJob partialDataJob = DataJobUpdateInputMapper.map(input, actor);
+        partialDataJob.setUrn(DataJobUrn.createFromString(input.getUrn()));
 
         try {
             Entity entity = new Entity();
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputSnapshotMapper.java
index 6223d98c66111c..5d25df4c49aa61 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputSnapshotMapper.java
@@ -8,6 +8,8 @@
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
 import com.linkedin.datahub.graphql.types.tag.mappers.TagAssociationUpdateMapper;
 import com.linkedin.datajob.DataJob;
+import com.linkedin.datajob.EditableDatajobProperties;
+
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 
@@ -40,6 +42,12 @@ public DataJob apply(@Nonnull final DataJobUpdateInput dataJobUpdateInput,
             );
             result.setGlobalTags(globalTags);
         }
+
+        if (dataJobUpdateInput.getEditableProperties() != null) {
+            final EditableDatajobProperties editableDatajobProperties = new EditableDatajobProperties();
+            editableDatajobProperties.setDescription(dataJobUpdateInput.getEditableProperties().getDescription());
+            result.setEditableProperties(editableDatajobProperties);
+        }
         return result;
     }
 }
diff --git a/datahub-web-react/src/graphql/dashboard.graphql b/datahub-web-react/src/graphql/dashboard.graphql
index 340776975ee507..7a84a211d0999f 100644
--- a/datahub-web-react/src/graphql/dashboard.graphql
+++ b/datahub-web-react/src/graphql/dashboard.graphql
@@ -1,6 +1,9 @@
 query getDashboard($urn: String!) {
     dashboard(urn: $urn) {
         ...dashboardFields
+        editableProperties {
+            description
+        }
         downstreamLineage {
             ...downstreamRelationshipFields
         }
@@ -13,6 +16,9 @@ query getDashboard($urn: String!) {
 mutation updateDashboard($input: DashboardUpdateInput!) {
     updateDashboard(input: $input) {
         ...dashboardFields
+        editableProperties {
+            description
+        }
         downstreamLineage {
             ...downstreamRelationshipFields
         }
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index 42ac8b0743be82..2b0566a2ee926f 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -303,9 +303,6 @@ fragment dashboardFields on Dashboard {
             time
         }
     }
-    editableProperties {
-        description
-    }
     ownership {
         ...ownershipFields
     }

From 3190a7ab6c781c2e66bcd0d7482df0d2dde1d6bd Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Sat, 12 Jun 2021 03:48:46 +0800
Subject: [PATCH 13/21] feat(datajob, dataflow): update aspects of datajob,
 dataflow, graphql mapper

---
 .../graphql/types/datajob/DataJobType.java    |  3 +
 .../mappers/DataJobUpdateInputMapper.java     | 10 ++-
 ....linkedin.dataflow.dataFlows.snapshot.json |  2 +-
 ...om.linkedin.datajob.dataJobs.snapshot.json | 18 +----
 ...com.linkedin.entity.entities.snapshot.json |  4 +-
 .../src/datahub/metadata/schema.avsc          | 76 +++++++++----------
 .../src/datahub/metadata/schema_classes.py    | 12 +--
 .../metadata/aspect/DataFlowAspect.pdl        |  2 +
 .../metadata/aspect/DataJobAspect.pdl         |  2 -
 9 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
index 4b0633a5ac2369..44c8a0586f7ae3 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
@@ -175,6 +175,9 @@ public static DataJobSnapshot toSnapshot(@Nonnull com.linkedin.datajob.DataJob d
         if (dataJob.hasGlobalTags()) {
             aspects.add(ModelUtils.newAspectUnion(DataJobAspect.class, dataJob.getGlobalTags()));
         }
+        if (dataJob.hasEditableProperties()) {
+            aspects.add(ModelUtils.newAspectUnion(DataJobAspect.class, dataJob.getEditableProperties()));
+        }
         return ModelUtils.newSnapshot(DataJobSnapshot.class, urn, aspects);
     }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
index 8c8d9875ba61bb..40bbad0cf245a5 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
@@ -1,8 +1,10 @@
 package com.linkedin.datahub.graphql.types.datajob.mappers;
 
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.SetMode;
 import com.linkedin.datahub.graphql.generated.DataJobUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
@@ -25,7 +27,9 @@ public static DataJob map(@Nonnull final DataJobUpdateInput dataJobUpdateInput,
     public DataJob apply(@Nonnull final DataJobUpdateInput dataJobUpdateInput,
                          @Nonnull final Urn actor) {
         final DataJob result = new DataJob();
-
+        final AuditStamp auditStamp = new AuditStamp();
+        auditStamp.setActor(actor, SetMode.IGNORE_NULL);
+        auditStamp.setTime(System.currentTimeMillis());
         if (dataJobUpdateInput.getOwnership() != null) {
             result.setOwnership(OwnershipUpdateMapper.map(dataJobUpdateInput.getOwnership(), actor));
         }
@@ -45,6 +49,10 @@ public DataJob apply(@Nonnull final DataJobUpdateInput dataJobUpdateInput,
         if (dataJobUpdateInput.getEditableProperties() != null) {
             final EditableDatajobProperties editableDatajobProperties = new EditableDatajobProperties();
             editableDatajobProperties.setDescription(dataJobUpdateInput.getEditableProperties().getDescription());
+            editableDatajobProperties.setLastModified(auditStamp);
+            if (editableDatajobProperties.hasCreated()) {
+                editableDatajobProperties.setCreated(auditStamp);
+            }
             result.setEditableProperties(editableDatajobProperties);
         }
         return result;
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
index 0c245c29cefc34..439434fc37518c 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataflow.dataFlows.snapshot.json
@@ -462,7 +462,7 @@
       "Aspect" : {
         "name" : "dataFlowKey"
       }
-    }, "com.linkedin.datajob.DataFlowInfo", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+    }, "com.linkedin.datajob.DataFlowInfo", "com.linkedin.datajob.EditableDataflowProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
   }, "com.linkedin.metadata.key.DataFlowKey", {
     "type" : "record",
     "name" : "AggregationMetadata",
diff --git a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
index baf02798462898..9ff0443f7fe2f1 100644
--- a/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.datajob.dataJobs.snapshot.json
@@ -568,21 +568,7 @@
       "doc" : "Editable properties",
       "optional" : true
     } ]
-  }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.DataJobKey", {
-    "type" : "record",
-    "name" : "EditableDataflowProperties",
-    "namespace" : "com.linkedin.datajob",
-    "doc" : "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
-    "include" : [ "com.linkedin.common.ChangeAuditStamps" ],
-    "fields" : [ {
-      "name" : "description",
-      "type" : "string",
-      "optional" : true
-    } ],
-    "Aspect" : {
-      "name" : "editableDataflowProperties"
-    }
-  }, "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.datajob.azkaban.AzkabanJobType", {
+  }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.DataJobKey", "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.datajob.azkaban.AzkabanJobType", {
     "type" : "typeref",
     "name" : "DataJobAspect",
     "namespace" : "com.linkedin.metadata.aspect",
@@ -617,7 +603,7 @@
       "Aspect" : {
         "name" : "dataJobKey"
       }
-    }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.EditableDataflowProperties", "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+    }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
   }, "com.linkedin.metadata.key.DataJobKey", {
     "type" : "record",
     "name" : "AggregationMetadata",
diff --git a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index 18e08dcf9a76a3..8feed31790754a 100644
--- a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -2058,7 +2058,7 @@
                   "Aspect" : {
                     "name" : "dataFlowKey"
                   }
-                }, "com.linkedin.datajob.DataFlowInfo", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+                }, "com.linkedin.datajob.DataFlowInfo", "com.linkedin.datajob.EditableDataflowProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
               }
             },
             "doc" : "The list of metadata aspects associated with the data flow. Depending on the use case, this can either be all, or a selection, of supported aspects."
@@ -2114,7 +2114,7 @@
                   "Aspect" : {
                     "name" : "dataJobKey"
                   }
-                }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.EditableDataflowProperties", "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
+                }, "com.linkedin.datajob.DataJobInfo", "com.linkedin.datajob.DataJobInputOutput", "com.linkedin.datajob.EditableDatajobProperties", "com.linkedin.common.Ownership", "com.linkedin.common.Status", "com.linkedin.common.GlobalTags", "com.linkedin.common.BrowsePaths" ]
               }
             },
             "doc" : "The list of metadata aspects associated with the data job. Depending on the use case, this can either be all, or a selection, of supported aspects."
diff --git a/metadata-ingestion/src/datahub/metadata/schema.avsc b/metadata-ingestion/src/datahub/metadata/schema.avsc
index 212d276ac0d648..7dc2ea00a5b2ba 100644
--- a/metadata-ingestion/src/datahub/metadata/schema.avsc
+++ b/metadata-ingestion/src/datahub/metadata/schema.avsc
@@ -1348,6 +1348,44 @@
                       "name": "dataFlowInfo"
                     }
                   },
+                  {
+                    "type": "record",
+                    "name": "EditableDataflowProperties",
+                    "namespace": "com.linkedin.pegasus2avro.datajob",
+                    "doc": "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
+                    "fields": [
+                      {
+                        "name": "created",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the creation of this resource/association/sub-resource"
+                      },
+                      {
+                        "name": "lastModified",
+                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
+                        "doc": "An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"
+                      },
+                      {
+                        "name": "deleted",
+                        "type": [
+                          "null",
+                          "com.linkedin.pegasus2avro.common.AuditStamp"
+                        ],
+                        "doc": "An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics.",
+                        "default": null
+                      },
+                      {
+                        "name": "description",
+                        "type": [
+                          "null",
+                          "string"
+                        ],
+                        "default": null
+                      }
+                    ],
+                    "Aspect": {
+                      "name": "editableDataflowProperties"
+                    }
+                  },
                   "com.linkedin.pegasus2avro.common.Ownership",
                   "com.linkedin.pegasus2avro.common.Status",
                   "com.linkedin.pegasus2avro.common.GlobalTags",
@@ -1601,44 +1639,6 @@
                       "name": "dataJobInputOutput"
                     }
                   },
-                  {
-                    "type": "record",
-                    "name": "EditableDataflowProperties",
-                    "namespace": "com.linkedin.pegasus2avro.datajob",
-                    "doc": "Stores editable changes made to properties. This separates changes made from\ningestion pipelines and edits in the UI to avoid accidental overwrites of user-provided data by ingestion pipelines",
-                    "fields": [
-                      {
-                        "name": "created",
-                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
-                        "doc": "An AuditStamp corresponding to the creation of this resource/association/sub-resource"
-                      },
-                      {
-                        "name": "lastModified",
-                        "type": "com.linkedin.pegasus2avro.common.AuditStamp",
-                        "doc": "An AuditStamp corresponding to the last modification of this resource/association/sub-resource. If no modification has happened since creation, lastModified should be the same as created"
-                      },
-                      {
-                        "name": "deleted",
-                        "type": [
-                          "null",
-                          "com.linkedin.pegasus2avro.common.AuditStamp"
-                        ],
-                        "doc": "An AuditStamp corresponding to the deletion of this resource/association/sub-resource. Logically, deleted MUST have a later timestamp than creation. It may or may not have the same time as lastModified depending upon the resource/association/sub-resource semantics.",
-                        "default": null
-                      },
-                      {
-                        "name": "description",
-                        "type": [
-                          "null",
-                          "string"
-                        ],
-                        "default": null
-                      }
-                    ],
-                    "Aspect": {
-                      "name": "editableDataflowProperties"
-                    }
-                  },
                   {
                     "type": "record",
                     "name": "EditableDatajobProperties",
diff --git a/metadata-ingestion/src/datahub/metadata/schema_classes.py b/metadata-ingestion/src/datahub/metadata/schema_classes.py
index a767a95424648e..e27a24815bb56d 100644
--- a/metadata-ingestion/src/datahub/metadata/schema_classes.py
+++ b/metadata-ingestion/src/datahub/metadata/schema_classes.py
@@ -4403,7 +4403,7 @@ class DataFlowSnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.DataFlowSnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["DataFlowKeyClass", "DataFlowInfoClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
+        aspects: List[Union["DataFlowKeyClass", "DataFlowInfoClass", "EditableDataflowPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
     ):
         super().__init__()
         
@@ -4435,13 +4435,13 @@ def urn(self, value: str) -> None:
     
     
     @property
-    def aspects(self) -> List[Union["DataFlowKeyClass", "DataFlowInfoClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
+    def aspects(self) -> List[Union["DataFlowKeyClass", "DataFlowInfoClass", "EditableDataflowPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
         """Getter: The list of metadata aspects associated with the data flow. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
     
     
     @aspects.setter
-    def aspects(self, value: List[Union["DataFlowKeyClass", "DataFlowInfoClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
+    def aspects(self, value: List[Union["DataFlowKeyClass", "DataFlowInfoClass", "EditableDataflowPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the data flow. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
     
@@ -4452,7 +4452,7 @@ class DataJobSnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.DataJobSnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDataflowPropertiesClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
+        aspects: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]],
     ):
         super().__init__()
         
@@ -4484,13 +4484,13 @@ def urn(self, value: str) -> None:
     
     
     @property
-    def aspects(self) -> List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDataflowPropertiesClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
+    def aspects(self) -> List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]:
         """Getter: The list of metadata aspects associated with the data job. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
     
     
     @aspects.setter
-    def aspects(self, value: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDataflowPropertiesClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
+    def aspects(self, value: List[Union["DataJobKeyClass", "DataJobInfoClass", "DataJobInputOutputClass", "EditableDatajobPropertiesClass", "OwnershipClass", "StatusClass", "GlobalTagsClass", "BrowsePathsClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the data job. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
     
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataFlowAspect.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataFlowAspect.pdl
index 07476449a131f9..7ed15f5396fd59 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataFlowAspect.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataFlowAspect.pdl
@@ -2,6 +2,7 @@ namespace com.linkedin.metadata.aspect
 
 import com.linkedin.metadata.key.DataFlowKey
 import com.linkedin.datajob.DataFlowInfo
+import com.linkedin.datajob.EditableDataflowProperties
 import com.linkedin.common.Ownership
 import com.linkedin.common.Status
 import com.linkedin.common.GlobalTags
@@ -13,6 +14,7 @@ import com.linkedin.common.BrowsePaths
 typeref DataFlowAspect = union[
     DataFlowKey,
     DataFlowInfo,
+    EditableDataflowProperties,
     Ownership,
     Status,
     GlobalTags,
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl
index f9baa2da5e407f..6659fa50ea6811 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/DataJobAspect.pdl
@@ -3,7 +3,6 @@ namespace com.linkedin.metadata.aspect
 import com.linkedin.metadata.key.DataJobKey
 import com.linkedin.datajob.DataJobInfo
 import com.linkedin.datajob.DataJobInputOutput
-import com.linkedin.datajob.EditableDataflowProperties
 import com.linkedin.datajob.EditableDatajobProperties
 import com.linkedin.common.Ownership
 import com.linkedin.common.Status
@@ -17,7 +16,6 @@ typeref DataJobAspect = union[
     DataJobKey,
     DataJobInfo,
     DataJobInputOutput,
-    EditableDataflowProperties,
     EditableDatajobProperties,
     Ownership,
     Status,

From 2d9ac51a03fe5f6b028d07ff3058dc6395a59b7a Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Sat, 12 Jun 2021 04:36:44 +0800
Subject: [PATCH 14/21] fix(metadata): chart updated after rebuild

---
 .../datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py
index 81c60cc17be6dd..0c13f9f9da5d14 100644
--- a/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py
+++ b/metadata-ingestion/src/datahub/metadata/com/linkedin/pegasus2avro/chart/__init__.py
@@ -17,4 +17,3 @@
 ChartType = ChartTypeClass
 EditableChartProperties = EditableChartPropertiesClass
 # fmt: on
-

From f8b7f522e029f12efd2fdec27afe2470a9b0049e Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Mon, 14 Jun 2021 18:48:34 +0800
Subject: [PATCH 15/21] feat(graphql): fix graphql mappers for datajob,
 dataflow, chart, dashboard

---
 .../chart/mappers/ChartUpdateInputSnapshotMapper.java  | 10 +++++++++-
 .../mappers/DashboardUpdateInputSnapshotMapper.java    |  9 +++++++++
 .../datahub/graphql/types/dataflow/DataFlowType.java   |  1 -
 .../dataflow/mappers/DataFlowUpdateInputMapper.java    |  9 +++++++++
 .../datahub/graphql/types/datajob/DataJobType.java     |  3 +--
 .../datajob/mappers/DataJobUpdateInputMapper.java      |  4 ++--
 datahub-web-react/src/graphql/dataFlow.graphql         |  3 +++
 7 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java
index 4fdf6402f0feeb..00a8e1e785403e 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartUpdateInputSnapshotMapper.java
@@ -1,10 +1,12 @@
 package com.linkedin.datahub.graphql.types.chart.mappers;
 
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.ChartUrn;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.chart.EditableChartProperties;
+import com.linkedin.data.template.SetMode;
 import com.linkedin.datahub.graphql.generated.ChartUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
@@ -30,7 +32,9 @@ public static ChartSnapshot map(@Nonnull final ChartUpdateInput chartUpdateInput
     public ChartSnapshot apply(@Nonnull final ChartUpdateInput chartUpdateInput,
                                @Nonnull final Urn actor) {
         final ChartSnapshot result = new ChartSnapshot();
-
+        final AuditStamp auditStamp = new AuditStamp();
+        auditStamp.setActor(actor, SetMode.IGNORE_NULL);
+        auditStamp.setTime(System.currentTimeMillis());
         try {
             result.setUrn(ChartUrn.createFromString(chartUpdateInput.getUrn()));
         } catch (URISyntaxException e) {
@@ -58,6 +62,10 @@ public ChartSnapshot apply(@Nonnull final ChartUpdateInput chartUpdateInput,
         if (chartUpdateInput.getEditableProperties() != null) {
             final EditableChartProperties editableChartProperties = new EditableChartProperties();
             editableChartProperties.setDescription(chartUpdateInput.getEditableProperties().getDescription());
+            if (!editableChartProperties.hasCreated()) {
+                editableChartProperties.setCreated(auditStamp);
+            }
+            editableChartProperties.setLastModified(auditStamp);
             aspects.add(ChartAspect.create(editableChartProperties));
         }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java
index d478de0db32fc0..b471ec2c5da3e2 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardUpdateInputSnapshotMapper.java
@@ -1,11 +1,13 @@
 package com.linkedin.datahub.graphql.types.dashboard.mappers;
 
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.GlobalTags;
 
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.DashboardUrn;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.dashboard.EditableDashboardProperties;
+import com.linkedin.data.template.SetMode;
 import com.linkedin.datahub.graphql.generated.DashboardUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
@@ -31,6 +33,9 @@ public static DashboardSnapshot map(@Nonnull final DashboardUpdateInput dashboar
     public DashboardSnapshot apply(@Nonnull final DashboardUpdateInput dashboardUpdateInput,
                            @Nonnull final Urn actor) {
         final DashboardSnapshot result = new DashboardSnapshot();
+        final AuditStamp auditStamp = new AuditStamp();
+        auditStamp.setActor(actor, SetMode.IGNORE_NULL);
+        auditStamp.setTime(System.currentTimeMillis());
 
         try {
             result.setUrn(DashboardUrn.createFromString(dashboardUpdateInput.getUrn()));
@@ -60,6 +65,10 @@ public DashboardSnapshot apply(@Nonnull final DashboardUpdateInput dashboardUpda
         if (dashboardUpdateInput.getEditableProperties() != null) {
             final EditableDashboardProperties editableDashboardProperties = new EditableDashboardProperties();
             editableDashboardProperties.setDescription(dashboardUpdateInput.getEditableProperties().getDescription());
+            if (!editableDashboardProperties.hasCreated()) {
+                editableDashboardProperties.setCreated(auditStamp);
+            }
+            editableDashboardProperties.setLastModified(auditStamp);
             aspects.add(ModelUtils.newAspectUnion(DashboardAspect.class, editableDashboardProperties));
         }
 
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
index 046cbdbb7d754c..c031353a45fa5f 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/DataFlowType.java
@@ -181,7 +181,6 @@ public DataFlow update(@Nonnull DataFlowUpdateInput input, @Nonnull QueryContext
 
         final CorpuserUrn actor = CorpuserUrn.createFromString(context.getActor());
         final com.linkedin.datajob.DataFlow partialDataFlow = DataFlowUpdateInputMapper.map(input, actor);
-        partialDataFlow.setUrn(DataFlowUrn.createFromString(input.getUrn()));
 
         try {
             Entity entity = new Entity();
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java
index 7c38068df16b69..b051cfd81a0279 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataflow/mappers/DataFlowUpdateInputMapper.java
@@ -1,8 +1,10 @@
 package com.linkedin.datahub.graphql.types.dataflow.mappers;
 
+import com.linkedin.common.AuditStamp;
 import com.linkedin.common.GlobalTags;
 import com.linkedin.common.TagAssociationArray;
 import com.linkedin.common.urn.Urn;
+import com.linkedin.data.template.SetMode;
 import com.linkedin.datahub.graphql.generated.DataFlowUpdateInput;
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipUpdateMapper;
 import com.linkedin.datahub.graphql.types.mappers.InputModelMapper;
@@ -25,6 +27,9 @@ public static DataFlow map(@Nonnull final DataFlowUpdateInput dataFlowUpdateInpu
     public DataFlow apply(@Nonnull final DataFlowUpdateInput dataFlowUpdateInput,
                           @Nonnull final Urn actor) {
         final DataFlow result = new DataFlow();
+        final AuditStamp auditStamp = new AuditStamp();
+        auditStamp.setActor(actor, SetMode.IGNORE_NULL);
+        auditStamp.setTime(System.currentTimeMillis());
 
         if (dataFlowUpdateInput.getOwnership() != null) {
             result.setOwnership(OwnershipUpdateMapper.map(dataFlowUpdateInput.getOwnership(), actor));
@@ -45,6 +50,10 @@ public DataFlow apply(@Nonnull final DataFlowUpdateInput dataFlowUpdateInput,
         if (dataFlowUpdateInput.getEditableProperties() != null) {
             final EditableDataflowProperties editableDataflowProperties = new EditableDataflowProperties();
             editableDataflowProperties.setDescription(dataFlowUpdateInput.getEditableProperties().getDescription());
+            if (!editableDataflowProperties.hasCreated()) {
+                editableDataflowProperties.setCreated(auditStamp);
+            }
+            editableDataflowProperties.setLastModified(auditStamp);
             result.setEditableProperties(editableDataflowProperties);
         }
         return result;
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
index 44c8a0586f7ae3..210cef1af3e2ba 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
@@ -186,11 +186,10 @@ public DataJob update(@Nonnull DataJobUpdateInput input, @Nonnull QueryContext c
 
         final CorpuserUrn actor = CorpuserUrn.createFromString(context.getActor());
         final com.linkedin.datajob.DataJob partialDataJob = DataJobUpdateInputMapper.map(input, actor);
-        partialDataJob.setUrn(DataJobUrn.createFromString(input.getUrn()));
 
         try {
             Entity entity = new Entity();
-            entity.setValue(Snapshot.create(toSnapshot(partialDataJob, partialDataJob.getUrn())));
+            entity.setValue(Snapshot.create(toSnapshot(partialDataJob, DataJobUrn.createFromString(input.getUrn()))));
             _dataJobsClient.update(entity);
         } catch (RemoteInvocationException e) {
             throw new RuntimeException(String.format("Failed to write entity with urn %s", input.getUrn()), e);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
index 40bbad0cf245a5..a68afa5b9d6656 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobUpdateInputMapper.java
@@ -49,10 +49,10 @@ public DataJob apply(@Nonnull final DataJobUpdateInput dataJobUpdateInput,
         if (dataJobUpdateInput.getEditableProperties() != null) {
             final EditableDatajobProperties editableDatajobProperties = new EditableDatajobProperties();
             editableDatajobProperties.setDescription(dataJobUpdateInput.getEditableProperties().getDescription());
-            editableDatajobProperties.setLastModified(auditStamp);
-            if (editableDatajobProperties.hasCreated()) {
+            if (!editableDatajobProperties.hasCreated()) {
                 editableDatajobProperties.setCreated(auditStamp);
             }
+            editableDatajobProperties.setLastModified(auditStamp);
             result.setEditableProperties(editableDatajobProperties);
         }
         return result;
diff --git a/datahub-web-react/src/graphql/dataFlow.graphql b/datahub-web-react/src/graphql/dataFlow.graphql
index d6332d288b4fc2..091079c6864ea7 100644
--- a/datahub-web-react/src/graphql/dataFlow.graphql
+++ b/datahub-web-react/src/graphql/dataFlow.graphql
@@ -14,6 +14,9 @@ fragment dataFlowFields on DataFlow {
             value
         }
     }
+    editableProperties {
+        description
+    }
     ownership {
         ...ownershipFields
     }

From 7b45d0ea8239d9096de687a0fe8b196867a4b689 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Mon, 14 Jun 2021 23:20:40 +0800
Subject: [PATCH 16/21] feat(react): update datajob, dataflow header in lineage
 sidebar

---
 .../entity/dataFlow/profile/DataFlowHeader.tsx  | 17 ++++++++++++++++-
 .../entity/dataJob/profile/DataJobHeader.tsx    | 16 +++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx b/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx
index b1a4afe697cef1..a6b8dd377d6276 100644
--- a/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataFlow/profile/DataFlowHeader.tsx
@@ -1,13 +1,19 @@
 import { Button, Divider, Row, Space, Typography } from 'antd';
 import React from 'react';
 import { FetchResult, MutationFunctionOptions } from '@apollo/client';
+import styled from 'styled-components';
 import { DataFlow, EntityType } from '../../../../types.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
+import CompactContext from '../../../shared/CompactContext';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
 import { AvatarsGroup } from '../../../shared/avatar';
 import UpdatableDescription from '../../shared/UpdatableDescription';
 import analytics, { EventType, EntityActionType } from '../../../analytics';
 
+const ButtonContainer = styled.div`
+    margin-top: 15px;
+`;
+
 export type Props = {
     dataFlow: DataFlow;
     updateDataFlow: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
@@ -18,6 +24,7 @@ export default function DataFlowHeader({
     updateDataFlow,
 }: Props) {
     const entityRegistry = useEntityRegistry();
+    const isCompact = React.useContext(CompactContext);
     const platformName = capitalizeFirstLetter(orchestrator);
 
     const openExternalUrl = () => {
@@ -37,10 +44,18 @@ export default function DataFlowHeader({
                     <Space split={<Divider type="vertical" />}>
                         <Typography.Text>Data Pipeline</Typography.Text>
                         <Typography.Text strong>{platformName}</Typography.Text>
-                        {info?.externalUrl && <Button onClick={openExternalUrl}>View in {platformName}</Button>}
+                        {!isCompact && info?.externalUrl && (
+                            <Button onClick={openExternalUrl}>View in {platformName}</Button>
+                        )}
                     </Space>
+                    {isCompact && info?.externalUrl && (
+                        <ButtonContainer>
+                            <Button onClick={openExternalUrl}>View in {platformName}</Button>
+                        </ButtonContainer>
+                    )}
                 </Row>
                 <UpdatableDescription
+                    isCompact={isCompact}
                     updateEntity={updateDataFlow}
                     updatedDescription={editableProperties?.description}
                     originalDescription={info?.description}
diff --git a/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx b/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx
index c3aa77d8ec8aa5..f0ad8f3b01e59e 100644
--- a/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx
+++ b/datahub-web-react/src/app/entity/dataJob/profile/DataJobHeader.tsx
@@ -5,6 +5,7 @@ import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { DataJob, EntityType } from '../../../../types.generated';
 import { useEntityRegistry } from '../../../useEntityRegistry';
+import CompactContext from '../../../shared/CompactContext';
 import { capitalizeFirstLetter } from '../../../shared/capitalizeFirstLetter';
 import { AvatarsGroup } from '../../../shared/avatar';
 import UpdatableDescription from '../../shared/UpdatableDescription';
@@ -14,6 +15,10 @@ const PlatFormLink = styled(Typography.Text)`
     color: inherit;
 `;
 
+const ButtonContainer = styled.div`
+    margin-top: 15px;
+`;
+
 export type Props = {
     dataJob: DataJob;
     updateDataJob: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
@@ -24,6 +29,7 @@ export default function DataJobHeader({
     updateDataJob,
 }: Props) {
     const entityRegistry = useEntityRegistry();
+    const isCompact = React.useContext(CompactContext);
     const platformName = dataFlow?.orchestrator ? capitalizeFirstLetter(dataFlow.orchestrator) : '';
 
     const openExternalUrl = () => {
@@ -56,10 +62,18 @@ export default function DataJobHeader({
                                 <PlatFormLink strong>{platformName}</PlatFormLink>
                             </Link>
                         )}
-                        {info?.externalUrl && <Button onClick={openExternalUrl}>View in {platformName}</Button>}
+                        {!isCompact && info?.externalUrl && (
+                            <Button onClick={openExternalUrl}>View in {platformName}</Button>
+                        )}
                     </Space>
+                    {isCompact && info?.externalUrl && (
+                        <ButtonContainer>
+                            <Button onClick={openExternalUrl}>View in {platformName}</Button>
+                        </ButtonContainer>
+                    )}
                 </Row>
                 <UpdatableDescription
+                    isCompact={isCompact}
                     updateEntity={updateDataJob}
                     updatedDescription={editableProperties?.description}
                     originalDescription={info?.description}

From a6cb97b26ff7233b1f527c09dd8f46948eb3fc15 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Tue, 15 Jun 2021 02:03:48 +0800
Subject: [PATCH 17/21] fix(ingest): fix ingest typo

---
 metadata-ingestion/examples/mce_files/bootstrap_mce.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-ingestion/examples/mce_files/bootstrap_mce.json b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
index 6854e13decf57f..350fbccb7a8c68 100644
--- a/metadata-ingestion/examples/mce_files/bootstrap_mce.json
+++ b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
@@ -127,7 +127,7 @@
                     },
                     {
                         "com.linkedin.pegasus2avro.dataset.EditableDatasetProperties": {
-                            "description_123": "TEST",
+                            "description": "Dataset Description Updated",
                             "tags": [
                                 "myfaketags"
                             ]

From 332bba301d86f9ead00a873de62d8bf880cd0ad7 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Tue, 15 Jun 2021 02:15:05 +0800
Subject: [PATCH 18/21] fix(ingest): cleanup ingest for
 editabledatasetproperties

---
 metadata-ingestion/examples/mce_files/bootstrap_mce.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/metadata-ingestion/examples/mce_files/bootstrap_mce.json b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
index 350fbccb7a8c68..499f2798c0b07c 100644
--- a/metadata-ingestion/examples/mce_files/bootstrap_mce.json
+++ b/metadata-ingestion/examples/mce_files/bootstrap_mce.json
@@ -125,14 +125,6 @@
                             }
                         }
                     },
-                    {
-                        "com.linkedin.pegasus2avro.dataset.EditableDatasetProperties": {
-                            "description": "Dataset Description Updated",
-                            "tags": [
-                                "myfaketags"
-                            ]
-                        }
-                    },
                     {
                         "com.linkedin.pegasus2avro.common.Ownership": {
                             "owners": [

From bcfb4fa59532d2c149119bf8c3ca036a51c8b3c7 Mon Sep 17 00:00:00 2001
From: Harshal Sheth <hsheth2@gmail.com>
Date: Mon, 14 Jun 2021 11:26:15 -0700
Subject: [PATCH 19/21] fix serde issue

---
 metadata-ingestion/tests/unit/serde/test_serde.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata-ingestion/tests/unit/serde/test_serde.py b/metadata-ingestion/tests/unit/serde/test_serde.py
index d3feb9b65e5e09..8404099dd88b02 100644
--- a/metadata-ingestion/tests/unit/serde/test_serde.py
+++ b/metadata-ingestion/tests/unit/serde/test_serde.py
@@ -75,7 +75,7 @@ def test_serde_to_avro(pytestconfig: PytestConfig, json_filename: str) -> None:
 
     # Deserialized from Avro.
     fo.seek(0)
-    in_records = list(fastavro.reader(fo))
+    in_records = list(fastavro.reader(fo, return_record_name=True))
     in_mces = [
         MetadataChangeEventClass.from_obj(record, tuples=True) for record in in_records
     ]

From 832d1c8d11753603e40afeda555512b0b94adbe5 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Thu, 17 Jun 2021 00:56:44 +0800
Subject: [PATCH 20/21] feat(gms, graphql): update dataeditableproperties,
 graphql endpoints for editableproperties, update description edit modal

---
 .../mappers/DatasetSnapshotMapper.java        |  3 --
 .../mappers/DatasetUpdateInputMapper.java     |  6 ----
 .../src/main/resources/gms.graphql            | 20 +++---------
 .../__tests__/SchemaDescriptionField.test.tsx |  3 --
 .../app/entity/shared/DescriptionModal.tsx    | 14 ++++----
 .../src/app/entity/shared/MarkdownViewer.tsx  | 32 +++++++++++++------
 .../entity/shared/UpdatableDescription.tsx    | 27 +++++++++-------
 datahub-web-react/src/graphql/dataset.graphql |  3 --
 .../src/graphql/fragments.graphql             |  3 --
 ...om.linkedin.dataset.datasets.snapshot.json |  5 ---
 ...com.linkedin.entity.entities.snapshot.json |  5 ---
 .../src/datahub/metadata/schema.avsc          |  9 ------
 .../src/datahub/metadata/schema_classes.py    | 15 ---------
 .../dataset/EditableDatasetProperties.pdl     |  5 ---
 14 files changed, 51 insertions(+), 99 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
index e9529290f60acb..bf0962f9104c77 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java
@@ -86,9 +86,6 @@ public Dataset apply(@Nonnull final DatasetSnapshot dataset) {
                 final EditableDatasetProperties editableDatasetProperties = (EditableDatasetProperties) aspect;
                 final DatasetEditableProperties editableProperties = new DatasetEditableProperties();
                 editableProperties.setDescription(editableDatasetProperties.getDescription());
-                if (editableDatasetProperties.getGlobalTags() != null) {
-                    editableProperties.setGlobalTags(GlobalTagsMapper.map(editableDatasetProperties.getGlobalTags()));
-                }
                 result.setEditableProperties(editableProperties);
             }
         });
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
index a5391169734a80..e3dc2fa6d26f58 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetUpdateInputMapper.java
@@ -78,12 +78,6 @@ public Dataset apply(@Nonnull final DatasetUpdateInput datasetUpdateInput,
         if (datasetUpdateInput.getEditableProperties() != null) {
             final EditableDatasetProperties editableDatasetProperties = new EditableDatasetProperties();
             editableDatasetProperties.setDescription(datasetUpdateInput.getEditableProperties().getDescription());
-            if (datasetUpdateInput.getEditableProperties().getGlobalTags() != null) {
-                final GlobalTags globalTags = new GlobalTags();
-                globalTags.setTags(new TagAssociationArray(datasetUpdateInput.getEditableProperties().getGlobalTags().getTags().stream().map(
-                        element -> TagAssociationUpdateMapper.map(element)).collect(Collectors.toList())));
-                editableDatasetProperties.setGlobalTags(globalTags);
-            }
             result.setEditableProperties(editableDatasetProperties);
         }
 
diff --git a/datahub-graphql-core/src/main/resources/gms.graphql b/datahub-graphql-core/src/main/resources/gms.graphql
index dff02a84c07730..165123dbad1c3b 100644
--- a/datahub-graphql-core/src/main/resources/gms.graphql
+++ b/datahub-graphql-core/src/main/resources/gms.graphql
@@ -665,36 +665,31 @@ type DatasetEditableProperties {
     """
     Description
     """
-    description: String!
-
-    """
-    Tags
-    """
-    globalTags: GlobalTags
+    description: String
 }
 type ChartEditableProperties {
     """
     Description
     """
-    description: String!
+    description: String
 }
 type DashboardEditableProperties {
     """
     Description
     """
-    description: String!
+    description: String
 }
 type DataJobEditableProperties {
     """
     Description
     """
-    description: String!
+    description: String
 }
 type DataFlowEditableProperties {
     """
     Description
     """
-    description: String!
+    description: String
 }
 
 type EntityRelationship {
@@ -1532,11 +1527,6 @@ input DatasetEditablePropertiesUpdate {
     Description
     """
     description: String!
-
-    """
-    Tags
-    """
-    globalTags: GlobalTagsUpdate
 }
 
 input ChartEditablePropertiesUpdate {
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
index 7d58c3d2eac2ab..5e037942c354df 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
@@ -10,7 +10,6 @@ describe('SchemaDescriptionField', () => {
                 <SchemaDescriptionField
                     description="test description"
                     updatedDescription="test description updated"
-                    onHover
                     onUpdate={async () => {}}
                 />
             </TestPageContainer>,
@@ -26,7 +25,6 @@ describe('SchemaDescriptionField', () => {
                 <SchemaDescriptionField
                     description="test description"
                     updatedDescription="test description updated"
-                    onHover
                     onUpdate={async () => {}}
                 />
             </TestPageContainer>,
@@ -37,7 +35,6 @@ describe('SchemaDescriptionField', () => {
         expect(getByText('Cancel')).toBeInTheDocument();
         expect(getByText('Update')).toBeInTheDocument();
         expect(getByText('Original:')).toBeInTheDocument();
-        expect(getByText('Updated:')).toBeInTheDocument();
         fireEvent.click(getByText('Cancel'));
         await waitFor(() => expect(queryByText('Update description')).not.toBeInTheDocument());
     });
diff --git a/datahub-web-react/src/app/entity/shared/DescriptionModal.tsx b/datahub-web-react/src/app/entity/shared/DescriptionModal.tsx
index 9b8f29eecff910..ab4f77074304dd 100644
--- a/datahub-web-react/src/app/entity/shared/DescriptionModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/DescriptionModal.tsx
@@ -29,7 +29,7 @@ type Props = {
 };
 
 export default function UpdateDescriptionModal({ title, description, original, onClose, onSubmit, isAddDesc }: Props) {
-    const [updatedDesc, setDesc] = useState(description);
+    const [updatedDesc, setDesc] = useState(description || original);
 
     return (
         <Modal
@@ -49,11 +49,6 @@ export default function UpdateDescriptionModal({ title, description, original, o
             }
         >
             <Form layout="vertical">
-                {!isAddDesc && (description || original) && (
-                    <Form.Item label={<FormLabel>Original:</FormLabel>}>
-                        <DescriptionMarkdown source={original || ''} />
-                    </Form.Item>
-                )}
                 {isAddDesc ? (
                     <Form.Item>
                         <MarkDownHelpLink href="https://joplinapp.org/markdown" target="_blank" type="secondary">
@@ -62,13 +57,18 @@ export default function UpdateDescriptionModal({ title, description, original, o
                         <MDEditor value={updatedDesc} onChange={(v) => setDesc(v || '')} preview="live" height={400} />
                     </Form.Item>
                 ) : (
-                    <Form.Item label={<FormLabel>Updated:</FormLabel>}>
+                    <Form.Item>
                         <MarkDownHelpLink href="https://joplinapp.org/markdown" target="_blank" type="secondary">
                             markdown supported
                         </MarkDownHelpLink>
                         <MDEditor value={updatedDesc} onChange={(v) => setDesc(v || '')} preview="live" height={400} />
                     </Form.Item>
                 )}
+                {!isAddDesc && description && original && (
+                    <Form.Item label={<FormLabel>Original:</FormLabel>}>
+                        <DescriptionMarkdown source={original || ''} />
+                    </Form.Item>
+                )}
             </Form>
         </Modal>
     );
diff --git a/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx b/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
index 2faca79f32e1d6..ad51ba516ad929 100644
--- a/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
+++ b/datahub-web-react/src/app/entity/shared/MarkdownViewer.tsx
@@ -1,10 +1,10 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { Button, Typography } from 'antd';
+import { Button } from 'antd';
 import { EditOutlined } from '@ant-design/icons';
 import MDEditor from '@uiw/react-md-editor';
 import styled from 'styled-components';
 
-const { Text } = Typography;
+// const { Text } = Typography;
 
 const EditIcon = styled(EditOutlined)`
     cursor: pointer;
@@ -33,24 +33,36 @@ const MarkdownContainer = styled.div<{ editable?: string }>`
 
 const CustomButton = styled(Button)`
     padding: 0;
+    color: #6a737d;
 `;
 
 const MarkdownViewContainer = styled.div<{
     showall?: string;
     limit?: string;
+    over?: string;
 }>`
     display: block;
     overflow-wrap: break-word;
     word-wrap: break-word;
+    overflow-x: hidden;
+    overflow-y: auto;
     ${(props) =>
         props.showall
             ? ''
             : `
         max-height: ${props.limit}px;
+        ${
+            props.over &&
+            `
+            &::after {
+                content: '...';
+                color: #6a737d;
+                position: absolute;
+                bottom: 2rem;
+            }
+        `
+        }
         `}
-    margin-bottom: 10px;
-    overflow-x: hidden;
-    overflow-y: auto;
 `;
 
 const MarkdownView = styled(MDEditor.Markdown)`
@@ -87,14 +99,16 @@ export default function MarkdownViewer({ source, limit = 150, editable, onEditCl
 
     return (
         <MarkdownContainer editable={editable ? 'true' : undefined}>
-            <MarkdownViewContainer showall={height >= limit && showAll ? 'true' : undefined} limit={`${limit}`}>
+            <MarkdownViewContainer
+                showall={height >= limit && showAll ? 'true' : undefined}
+                limit={`${limit}`}
+                over={height >= limit ? 'true' : undefined}
+            >
                 <MarkdownView ref={ref} source={source} />
             </MarkdownViewContainer>
             {height >= limit && (
                 <CustomButton type="link" onClick={() => setShowAll(!showAll)}>
-                    <Text italic type="secondary">
-                        {showAll ? 'show less' : '... show more'}
-                    </Text>
+                    {showAll ? 'show less' : 'show more'}
                 </CustomButton>
             )}
             <EditIcon twoToneColor="#52c41a" onClick={onEditClicked} />
diff --git a/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx b/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
index 432c397b11be55..85ef95ae34da60 100644
--- a/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
+++ b/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
@@ -35,17 +35,22 @@ export default function UpdatableDescription({
     const [showAddDescModal, setShowAddDescModal] = useState(false);
     const onSubmit = async (description: string | null) => {
         message.loading({ content: 'Updating...' });
-        await updateEntity({
-            variables: { input: { urn, editableProperties: { description: description || '' } } },
-        });
-        message.destroy();
-        analytics.event({
-            type: EventType.EntityActionEvent,
-            actionType: EntityActionType.UpdateDescription,
-            entityType,
-            entityUrn: urn,
-        });
-        message.success({ content: 'Updated!', duration: 2 });
+        try {
+            await updateEntity({
+                variables: { input: { urn, editableProperties: { description: description || '' } } },
+            });
+            message.destroy();
+            analytics.event({
+                type: EventType.EntityActionEvent,
+                actionType: EntityActionType.UpdateDescription,
+                entityType,
+                entityUrn: urn,
+            });
+            message.success({ content: 'Updated!', duration: 2 });
+        } catch (e) {
+            message.destroy();
+            message.error({ content: `Update Failed! \n ${e.message || ''}`, duration: 2 });
+        }
         setShowAddDescModal(false);
     };
 
diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
index de96085e1cae25..048ef332987d98 100644
--- a/datahub-web-react/src/graphql/dataset.graphql
+++ b/datahub-web-react/src/graphql/dataset.graphql
@@ -32,9 +32,6 @@ query getDataset($urn: String!) {
         }
         editableProperties {
             description
-            globalTags {
-                ...globalTagsFields
-            }
         }
         ownership {
             ...ownershipFields
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index 2b0566a2ee926f..0aaec6790fe501 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -112,9 +112,6 @@ fragment nonRecursiveDatasetFields on Dataset {
     }
     editableProperties {
         description
-        globalTags {
-            ...globalTagsFields
-        }
     }
     ownership {
         ...ownershipFields
diff --git a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
index 31681d3df152ab..5eba1bbf6ffd52 100644
--- a/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.dataset.datasets.snapshot.json
@@ -612,11 +612,6 @@
           "type" : "string",
           "doc" : "Documentation of the dataset",
           "optional" : true
-        }, {
-          "name" : "globalTags",
-          "type" : "com.linkedin.common.GlobalTags",
-          "doc" : "globalTags",
-          "optional" : true
         } ],
         "Aspect" : {
           "name" : "editableDatasetProperties"
diff --git a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index 8feed31790754a..576af7561c7125 100644
--- a/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/gms/api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -1569,11 +1569,6 @@
       "type" : "string",
       "doc" : "Documentation of the dataset",
       "optional" : true
-    }, {
-      "name" : "globalTags",
-      "type" : "com.linkedin.common.GlobalTags",
-      "doc" : "globalTags",
-      "optional" : true
     } ],
     "Aspect" : {
       "name" : "editableDatasetProperties"
diff --git a/metadata-ingestion/src/datahub/metadata/schema.avsc b/metadata-ingestion/src/datahub/metadata/schema.avsc
index 7dc2ea00a5b2ba..116584a11cec02 100644
--- a/metadata-ingestion/src/datahub/metadata/schema.avsc
+++ b/metadata-ingestion/src/datahub/metadata/schema.avsc
@@ -1869,15 +1869,6 @@
                         ],
                         "doc": "Documentation of the dataset",
                         "default": null
-                      },
-                      {
-                        "name": "globalTags",
-                        "type": [
-                          "null",
-                          "com.linkedin.pegasus2avro.common.GlobalTags"
-                        ],
-                        "doc": "globalTags",
-                        "default": null
                       }
                     ],
                     "Aspect": {
diff --git a/metadata-ingestion/src/datahub/metadata/schema_classes.py b/metadata-ingestion/src/datahub/metadata/schema_classes.py
index 4000e90e9e6d18..22f211739ec146 100644
--- a/metadata-ingestion/src/datahub/metadata/schema_classes.py
+++ b/metadata-ingestion/src/datahub/metadata/schema_classes.py
@@ -2754,7 +2754,6 @@ def __init__(self,
         lastModified: "AuditStampClass",
         deleted: Union[None, "AuditStampClass"]=None,
         description: Union[None, str]=None,
-        globalTags: Union[None, "GlobalTagsClass"]=None,
     ):
         super().__init__()
         
@@ -2762,7 +2761,6 @@ def __init__(self,
         self.lastModified = lastModified
         self.deleted = deleted
         self.description = description
-        self.globalTags = globalTags
     
     @classmethod
     def construct_with_defaults(cls) -> "EditableDatasetPropertiesClass":
@@ -2776,7 +2774,6 @@ def _restore_defaults(self) -> None:
         self.lastModified = AuditStampClass.construct_with_defaults()
         self.deleted = self.RECORD_SCHEMA.field_map["deleted"].default
         self.description = self.RECORD_SCHEMA.field_map["description"].default
-        self.globalTags = self.RECORD_SCHEMA.field_map["globalTags"].default
     
     
     @property
@@ -2827,18 +2824,6 @@ def description(self, value: Union[None, str]) -> None:
         self._inner_dict['description'] = value
     
     
-    @property
-    def globalTags(self) -> Union[None, "GlobalTagsClass"]:
-        """Getter: globalTags"""
-        return self._inner_dict.get('globalTags')  # type: ignore
-    
-    
-    @globalTags.setter
-    def globalTags(self, value: Union[None, "GlobalTagsClass"]) -> None:
-        """Setter: globalTags"""
-        self._inner_dict['globalTags'] = value
-    
-    
 class UpstreamClass(DictWrapper):
     """Upstream lineage information about a dataset including the source reporting the lineage"""
     
diff --git a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
index 9773c1cbbdd931..88dd9a9554ffc1 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/dataset/EditableDatasetProperties.pdl
@@ -15,9 +15,4 @@ record EditableDatasetProperties includes ChangeAuditStamps {
    * Documentation of the dataset
    */
   description: optional string
-
-  /**
-   * globalTags
-   */
-  globalTags: optional GlobalTags
 }
\ No newline at end of file

From 1aa39766fd92df5fc857ecb1a3cedfc965332a42 Mon Sep 17 00:00:00 2001
From: Brian <brianwebtek@gmail.com>
Date: Thu, 17 Jun 2021 01:16:14 +0800
Subject: [PATCH 21/21] fix(react): fix minor type issue

---
 .../src/app/entity/shared/UpdatableDescription.tsx              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx b/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
index 85ef95ae34da60..7d015caa5b2a18 100644
--- a/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
+++ b/datahub-web-react/src/app/entity/shared/UpdatableDescription.tsx
@@ -18,7 +18,7 @@ const AddNewDescription = styled(Tag)`
 export type Props = {
     isCompact?: boolean;
     updateEntity: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
-    updatedDescription?: string;
+    updatedDescription?: string | null;
     originalDescription?: string | null;
     entityType: EntityType;
     urn: string;