fix: move slack channel to top of table description (#1446)

* fix: move slack channel to top of table description * fix: move slack channel to top of table description * address comments * use pinnedCustomProperties to order properties * use pinnedCustomProperties to order properties
pinterest · May 8, 2024 · af818be · af818be
1 parent 74790d6
commit af818be
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 18 deletions.
diff --git a/querybook/webapp/components/DataTableViewOverview/DataTableViewOverview.tsx b/querybook/webapp/components/DataTableViewOverview/DataTableViewOverview.tsx
@@ -25,7 +25,7 @@ import {
 } from 'const/metastore';
 import { useMounted } from 'hooks/useMounted';
 import { Nullable } from 'lib/typescript';
-import { titleize } from 'lib/utils';
+import { isValidUrl, titleize } from 'lib/utils';
 import { generateFormattedDate } from 'lib/utils/datetime';
 import { getAppName } from 'lib/utils/global';
 import { getHumanReadableByteSize } from 'lib/utils/number';
@@ -34,6 +34,7 @@ import { refreshDataTableInMetastore } from 'redux/dataSources/action';
 import { SoftButton, TextButton } from 'ui/Button/Button';
 import { EditableTextField } from 'ui/EditableTextField/EditableTextField';
 import { KeyContentDisplay } from 'ui/KeyContentDisplay/KeyContentDisplay';
+import { KeyContentDisplayLink } from 'ui/KeyContentDisplay/KeyContentDisplayLink';
 import { Link } from 'ui/Link/Link';
 import { LoadingRow } from 'ui/Loading/Loading';
 import { Message } from 'ui/Message/Message';
@@ -56,6 +57,11 @@ const dataTableDetailsRows = [
     'column_count',
 ];
 
+/**
+ * Any custom properties in this array will be shown on top following the order of the array
+ */
+const pinnedCustomProperties = ['channels'];
+
 function useRefreshMetastore(table: IDataTable) {
     const dispatch = useDispatch();
     const isMounted = useMounted();
@@ -151,22 +157,33 @@ export const DataTableViewOverview: React.FC<
             );
         });
 
-    const customPropertiesDOM = Object.entries(
-        table.custom_properties ?? {}
-    ).map(([key, value]) => {
-        const valueStr = value?.toString() ?? '';
-        return (
-            <KeyContentDisplay key={key} keyString={titleize(key, '_', ' ')}>
-                {valueStr && /https?:\/\/[^\s]+/.test(valueStr.trim()) ? (
-                    <Link to={valueStr} newTab>
-                        {valueStr}
-                    </Link>
-                ) : (
-                    valueStr
-                )}
-            </KeyContentDisplay>
-        );
-    });
+    const customProperties = table.custom_properties ?? {};
+
+    // Get pinned custom properties and display based on order of pinnedCustomProperties
+    const pinnedPropertiesDOM = pinnedCustomProperties
+        .filter((p) => p in customProperties)
+        .map((key) => {
+            const value = customProperties[key];
+            return (
+                <KeyContentDisplayLink
+                    key={key}
+                    keyString={key}
+                    value={value}
+                />
+            );
+        });
+
+    const otherPropertiesDOM = Object.entries(customProperties)
+        .filter(([key]) => !pinnedCustomProperties.includes(key))
+        .map(([key, value]) => {
+            return (
+                <KeyContentDisplayLink
+                    key={key}
+                    keyString={key}
+                    value={value}
+                />
+            );
+        });
 
     const rawMetastoreInfoDOM = table.hive_metastore_description ? (
         <pre className="raw-metastore-info">
@@ -209,8 +226,9 @@ export const DataTableViewOverview: React.FC<
     );
     const detailsSection = (
         <DataTableViewOverviewSection title="Details">
+            {pinnedPropertiesDOM}
             {detailsDOM}
-            {customPropertiesDOM}
+            {otherPropertiesDOM}
         </DataTableViewOverviewSection>
     );
 

diff --git a/querybook/webapp/ui/KeyContentDisplay/KeyContentDisplayLink.tsx b/querybook/webapp/ui/KeyContentDisplay/KeyContentDisplayLink.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+
+import { isValidUrl, titleize } from 'lib/utils';
+import { Link } from 'ui/Link/Link';
+
+import { KeyContentDisplay } from './KeyContentDisplay';
+
+export const KeyContentDisplayLink: React.FunctionComponent<{
+    keyString: string;
+    value: string | number;
+}> = ({ keyString, value }) => {
+    const valueStr = value?.toString() ?? '';
+    return (
+        <KeyContentDisplay
+            key={keyString}
+            keyString={titleize(keyString, '_', ' ')}
+        >
+            {valueStr && isValidUrl(valueStr.trim()) ? (
+                <Link to={valueStr} newTab>
+                    {valueStr}
+                </Link>
+            ) : (
+                valueStr
+            )}
+        </KeyContentDisplay>
+    );
+};