+
{header}
- {/* Always show both carets */}
@@ -61,7 +86,15 @@ const SortableTable = ({ children, columnAlignments }) => {
{data.map((row, rowIndex) => (
{row.map((cell, cellIndex) => (
- | {cell || '\u00A0'} | // Apply alignment to cells
+
+ {cell || '\u00A0'}
+ |
))}
))}
From 04902babc5bfc89a58b61df284fdd11c4fc767a8 Mon Sep 17 00:00:00 2001
From: Matt Shaver <60105315+matthewshaver@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:52:06 -0400
Subject: [PATCH 09/14] FIxing syntax
---
website/src/components/sortableTable/index.js | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/website/src/components/sortableTable/index.js b/website/src/components/sortableTable/index.js
index e1ebf7ff21a..d7e94143ece 100644
--- a/website/src/components/sortableTable/index.js
+++ b/website/src/components/sortableTable/index.js
@@ -4,17 +4,16 @@ const parseMarkdownTable = (markdown) => {
const rows = markdown.trim().split('\n');
const headers = rows[0].split('|').map((header) => header.trim()).filter(Boolean);
- // Parse the alignment row
const alignmentsRow = rows[1].split('|').map((align) => align.trim()).filter(Boolean);
const columnAlignments = alignmentsRow.map((alignment) => {
if (alignment.startsWith(':') && alignment.endsWith(':')) {
- return 'center'; // :-----:
+ return 'center';
} else if (alignment.startsWith(':')) {
- return 'left'; // :-----
+ return 'left';
} else if (alignment.endsWith(':')) {
- return 'right'; // -----:
+ return 'right';
} else {
- return 'left'; // Default alignment
+ return 'left';
}
});
@@ -56,7 +55,7 @@ const SortableTable = ({ children }) => {
style={{
cursor: 'pointer',
position: 'relative',
- textAlign: columnAlignments[index], // Use detected alignment
+ textAlign: columnAlignments[index],
padding: '10px'
}}
>
@@ -89,7 +88,7 @@ const SortableTable = ({ children }) => {
From b3872792d000a9d3b656979b9c45154d00181407 Mon Sep 17 00:00:00 2001
From: Matt Shaver <60105315+matthewshaver@users.noreply.github.com>
Date: Thu, 7 Nov 2024 23:06:10 -0500
Subject: [PATCH 10/14] Fixing table markdown formatting
---
website/package-lock.json | 12 ++++++++++++
website/package.json | 1 +
.../snippets/_enterprise-permissions-table.md | 4 ++--
website/src/components/sortableTable/index.js | 17 +++++++++++++----
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/website/package-lock.json b/website/package-lock.json
index 5fdf491f1cf..df0c9652529 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -27,6 +27,7 @@
"gray-matter": "^4.0.3",
"hast-util-is-element": "^1.1.0",
"js-yaml": "^4.1.0",
+ "markdown-to-jsx": "^7.5.0",
"mobx": "^6.3.9",
"node-polyfill-webpack-plugin": "^1.1.4",
"papaparse": "^5.3.2",
@@ -17038,6 +17039,17 @@
"url": "https://github.com/sponsors/wooorm"
}
},
+ "node_modules/markdown-to-jsx": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.5.0.tgz",
+ "integrity": "sha512-RrBNcMHiFPcz/iqIj0n3wclzHXjwS7mzjBNWecKKVhNTIxQepIix6Il/wZCn2Cg5Y1ow2Qi84+eJrryFRWBEWw==",
+ "engines": {
+ "node": ">= 10"
+ },
+ "peerDependencies": {
+ "react": ">= 0.14.0"
+ }
+ },
"node_modules/marked": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
diff --git a/website/package.json b/website/package.json
index 51edae4bf17..a16c8f9db9b 100644
--- a/website/package.json
+++ b/website/package.json
@@ -30,6 +30,7 @@
"gray-matter": "^4.0.3",
"hast-util-is-element": "^1.1.0",
"js-yaml": "^4.1.0",
+ "markdown-to-jsx": "^7.5.0",
"mobx": "^6.3.9",
"node-polyfill-webpack-plugin": "^1.1.4",
"papaparse": "^5.3.2",
diff --git a/website/snippets/_enterprise-permissions-table.md b/website/snippets/_enterprise-permissions-table.md
index ea92d598d83..7ec435f5c05 100644
--- a/website/snippets/_enterprise-permissions-table.md
+++ b/website/snippets/_enterprise-permissions-table.md
@@ -19,14 +19,14 @@ Account roles enable you to manage the dbt Cloud account and manage the account
{`
| Account-level permission| Account Admin | Billing admin | Manage marketplace apps | Project creator | Security admin | Viewer |
|:-----------------------:|:-------------:|:--------------:|:------------------------:|:---------------:|:--------------:|:-------:|
-| Account settings | W | - | - | R | R | R |
+| [Account settings](https://www.youtube.com) | **W** | - | - | _R_ | R | R |
| Audit logs | R | - | - | - | R | R |
| Auth provider | W | - | - | - | W | R |
| Billing | W | W | - | - | - | R |
| Connections | W | - | - | W | - | - |
| Groups | W | - | - | R | W | R |
| Invitations | W | - | - | W | W | R |
-| IP restrictions | W | - | - | - | W | R |
+| [IP restrictions](https://www.youtube.com) | W | - | - | - | W | R |
| Licenses | W | - | - | W | W | R |
| Marketplace app | - | - | W | - | - | - |
| Members | W | - | - | W | W | R |
diff --git a/website/src/components/sortableTable/index.js b/website/src/components/sortableTable/index.js
index d7e94143ece..42844bf3860 100644
--- a/website/src/components/sortableTable/index.js
+++ b/website/src/components/sortableTable/index.js
@@ -1,4 +1,13 @@
import React, { useState } from 'react';
+import Markdown from 'markdown-to-jsx';
+
+const stripMarkdown = (text) => {
+ // Remove link syntax: [text](url) -> text
+ let strippedText = text.replace(/\[([^\]]+)\]\([^)]+\)/g, '$1');
+ // Remove other Markdown characters like *, _, ~, ` (for bold, italics, etc.)
+ strippedText = strippedText.replace(/[_*`~]/g, '');
+ return strippedText;
+};
const parseMarkdownTable = (markdown) => {
const rows = markdown.trim().split('\n');
@@ -17,7 +26,6 @@ const parseMarkdownTable = (markdown) => {
}
});
- // Get the table data
const data = rows.slice(2).map(row => row.split('|').map(cell => cell.trim()).filter(Boolean));
return { headers, data, columnAlignments };
@@ -34,8 +42,9 @@ const SortableTable = ({ children }) => {
setSortConfig({ key: keyIndex, direction: newDirection });
const sortedData = [...data].sort((a, b) => {
- const aVal = a[keyIndex];
- const bVal = b[keyIndex];
+
+ const aVal = stripMarkdown(a[keyIndex]);
+ const bVal = stripMarkdown(b[keyIndex]);
if (aVal < bVal) return newDirection === 'asc' ? -1 : 1;
if (aVal > bVal) return newDirection === 'asc' ? 1 : -1;
return 0;
@@ -92,7 +101,7 @@ const SortableTable = ({ children }) => {
padding: '8px'
}}
>
- {cell || '\u00A0'}
+ {cell || '\u00A0'}
|
))}
From 4ec39757ffc78bcff464065dc7a9396acdb4c900 Mon Sep 17 00:00:00 2001
From: Matt Shaver <60105315+matthewshaver@users.noreply.github.com>
Date: Thu, 7 Nov 2024 23:07:43 -0500
Subject: [PATCH 11/14] Removing notes
---
website/src/components/sortableTable/index.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/website/src/components/sortableTable/index.js b/website/src/components/sortableTable/index.js
index 42844bf3860..22c64ff4ea2 100644
--- a/website/src/components/sortableTable/index.js
+++ b/website/src/components/sortableTable/index.js
@@ -2,9 +2,9 @@ import React, { useState } from 'react';
import Markdown from 'markdown-to-jsx';
const stripMarkdown = (text) => {
- // Remove link syntax: [text](url) -> text
+
let strippedText = text.replace(/\[([^\]]+)\]\([^)]+\)/g, '$1');
- // Remove other Markdown characters like *, _, ~, ` (for bold, italics, etc.)
+
strippedText = strippedText.replace(/[_*`~]/g, '');
return strippedText;
};
From 0f4353cadbcc83e5ed66ed120cb886798825fd9c Mon Sep 17 00:00:00 2001
From: Mirna Wong <89008547+mirnawong1@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:01:26 +0000
Subject: [PATCH 12/14] Update _enterprise-permissions-table.md
---
website/snippets/_enterprise-permissions-table.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/snippets/_enterprise-permissions-table.md b/website/snippets/_enterprise-permissions-table.md
index 7ec435f5c05..c5ab0090343 100644
--- a/website/snippets/_enterprise-permissions-table.md
+++ b/website/snippets/_enterprise-permissions-table.md
@@ -20,7 +20,7 @@ Account roles enable you to manage the dbt Cloud account and manage the account
| Account-level permission| Account Admin | Billing admin | Manage marketplace apps | Project creator | Security admin | Viewer |
|:-----------------------:|:-------------:|:--------------:|:------------------------:|:---------------:|:--------------:|:-------:|
| [Account settings](https://www.youtube.com) | **W** | - | - | _R_ | R | R |
-| Audit logs | R | - | - | - | R | R |
+| Audit logs
test test | R | - | - | - | R | R |
| Auth provider | W | - | - | - | W | R |
| Billing | W | W | - | - | - | R |
| Connections | W | - | - | W | - | - |
From d6dc431f9e1ed63ce39de8c57d7b5bcefeb864f8 Mon Sep 17 00:00:00 2001
From: Mirna Wong <89008547+mirnawong1@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:16:07 +0000
Subject: [PATCH 13/14] Update _enterprise-permissions-table.md
---
website/snippets/_enterprise-permissions-table.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/website/snippets/_enterprise-permissions-table.md b/website/snippets/_enterprise-permissions-table.md
index c5ab0090343..5dd67407d9a 100644
--- a/website/snippets/_enterprise-permissions-table.md
+++ b/website/snippets/_enterprise-permissions-table.md
@@ -19,14 +19,14 @@ Account roles enable you to manage the dbt Cloud account and manage the account
{`
| Account-level permission| Account Admin | Billing admin | Manage marketplace apps | Project creator | Security admin | Viewer |
|:-----------------------:|:-------------:|:--------------:|:------------------------:|:---------------:|:--------------:|:-------:|
-| [Account settings](https://www.youtube.com) | **W** | - | - | _R_ | R | R |
-| Audit logs
test test | R | - | - | - | R | R |
+| Account settings | **W** | - | - | _R_ | R | R |
+| Audit logs | R | - | - | - | R | R |
| Auth provider | W | - | - | - | W | R |
| Billing | W | W | - | - | - | R |
| Connections | W | - | - | W | - | - |
| Groups | W | - | - | R | W | R |
| Invitations | W | - | - | W | W | R |
-| [IP restrictions](https://www.youtube.com) | W | - | - | - | W | R |
+| IP restrictions | W | - | - | - | W | R |
| Licenses | W | - | - | W | W | R |
| Marketplace app | - | - | W | - | - | - |
| Members | W | - | - | W | W | R |
From c41f5046fd79025c1d76ef27d5bb9bf9f0447f58 Mon Sep 17 00:00:00 2001
From: Mirna Wong <89008547+mirnawong1@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:16:41 +0000
Subject: [PATCH 14/14] Update _enterprise-permissions-table.md
---
website/snippets/_enterprise-permissions-table.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/website/snippets/_enterprise-permissions-table.md b/website/snippets/_enterprise-permissions-table.md
index 5dd67407d9a..10a4bbf56d0 100644
--- a/website/snippets/_enterprise-permissions-table.md
+++ b/website/snippets/_enterprise-permissions-table.md
@@ -19,11 +19,11 @@ Account roles enable you to manage the dbt Cloud account and manage the account
{`
| Account-level permission| Account Admin | Billing admin | Manage marketplace apps | Project creator | Security admin | Viewer |
|:-----------------------:|:-------------:|:--------------:|:------------------------:|:---------------:|:--------------:|:-------:|
-| Account settings | **W** | - | - | _R_ | R | R |
+| [Account settings](www.youtube.com) | **W** | - | - | _R_ | R | R |
| Audit logs | R | - | - | - | R | R |
-| Auth provider | W | - | - | - | W | R |
+| [Auth provider](/docs/build/models) | W | - | - | - | W | R |
| Billing | W | W | - | - | - | R |
-| Connections | W | - | - | W | - | - |
+| Connections
test test | W | - | - | W | - | - |
| Groups | W | - | - | R | W | R |
| Invitations | W | - | - | W | W | R |
| IP restrictions | W | - | - | - | W | R |