Fix version orders

contributing/single-sourcing-content.md

@@ -132,94 +132,6 @@ $ dbt test --models [...] --defer --state path/to/artifacts
 </VersionBlock>
 ```
 
-## Using global variables
-
----
-
-Global variables can be configured for use throughout the docs.
-
-Using a global variable requires two steps:
-
-1. Set the variable in the `website/dbt-global-variables.js` file.
-2. Use the **Var** component to add the global variable to a page.
-
-```jsx
-// The dbtCore property is the identifier for the variable,
-// while the name property is the value shown on the page.
-
-exports.dbtVariables = {
-  dbtCore: {
-    name: "dbt Core"
-  }
-}
-```
-
-```markdown
-// <Var name="dbtCore" /> is converted to dbt Core
-
-You can install <Var name="dbtCore" /> on the command line by using one of these recommended methods:
-```
-
-### Versioning global variables
-
-It is possible to version global variables as well. This creates the ability to show different variations of a string based off the current version a visitor has selected.
-
-To extend our `dbt-global-variables.js` file above, we can add a new variable: *note - these versions are not accurate and only shown for this example.*
-
-```jsx
-// A new variable called dbtCloud is added below
-// This variable includes a versions array
-// "Sinter" will replace "dbt Cloud" for versions 0.21 or lower
-
-exports.dbtVariables = {
-  dbtCore: {
-    name: "dbt Core"
-  },
-	dbtCloud: {
-		name: "dbt Cloud",
-		versions: [
-      {
-        "name": "Sinter",
-        "version": "0.21"
-      }
-    ]
-	}
-}
-```
-
-```markdown
-You can get started with <Var name="dbtCloud" /> by [Signing up](https://www.getdbt.com/signup/).
-```
-
-In the above example, the **dbtCloud** property has a default name of “dbt Cloud”. The naming for variables cascade down, meaning “dbt Cloud” will show for all versions, until version **0.21** or lower is selected. At that point “Sinter” will replace “dbt Cloud”.
-
-### Global variables properties
-
-**name** (required): Expects the identifier for a global variable.
-
-### Global variables example
-
-The global `<Var />` component can be used inline, for example:
-
-```markdown
-This piece of markdown content explains why <Var name="dbt" /> is awesome.
-```
-
-However, a Var component cannot start a new line of content. Fortunately, a workaround exists to use the Var component at the beginning of a line of content.
-
-To use the component at the beginning of a sentence, add a non-breaking space character before the component:
-
-```markdown
-// When starting a new line with a global variable,
-// a non-breaking space is required
-
-// Works
-&nbsp;<Var name="dbt" /> is awesome!
-
-// Does not work
-<Var name="dbt" /> is awesome!
-```
-
 ## Reusing content
 
 To reuse content on different pages, you can use some techniques like partial files or snippets. Partial files, a built-in Docusaurus feature, is the recommended method over snippets.

website/dbt-versions.js

@@ -14,6 +14,18 @@
  * customDisplay for dbt Cloud should be a version ahead of latest dbt Core release (GA or beta).
  */
 exports.versions = [
+  {
+    version: "2.1",
+    EOLDate: "2026-04-15",
+  },
+  {
+    version: "1.10.1",
+    EOLDate: "2026-04-15",
+  },
+  {
+    version: "1.10",
+    EOLDate: "2026-04-15",
+  },
   {
     version: "1.9.1",
     customDisplay: "Cloud (Versionless)",
@@ -30,7 +42,7 @@ exports.versions = [
     version: "1.6",
     EOLDate: "2024-07-31",
   },
-]
+];
 
 /**
  * Controls doc page visibility in the sidebar based on the current version
@@ -43,11 +55,11 @@ exports.versions = [
  */
 exports.versionedPages = [
   {
-    "page": "/reference/resource-configs/target_database",
+    "page": "reference/resource-configs/target_database",
     "lastVersion": "1.8",
   },
   {
-    "page": "/reference/resource-configs/target_schema",
+    "page": "reference/resource-configs/target_schema",
     "lastVersion": "1.8",
   },
   {
@@ -201,5 +213,10 @@ exports.versionedCategories = [
   {
     "category": "Build your metrics",
     "firstVersion": "1.6",
-  }
+  },
+  // TODO: Delete demo entry below
+  {
+    "category": "Project configs",
+    "firstVersion": "1.8",
+  },
 ]

website/docs/docs/version-testing.md

@@ -0,0 +1,16 @@
+---
+title: "Version Testing"
+id: "version-testing"
+---
+
+<VersionBlock firstVersion="1.6" lastVersion="1.9.1">
+  ## first version - 1.6 | last version - 1.9.1
+</VersionBlock>
+
+<VersionBlock firstVersion="2.1">
+  ## first version - 2.1
+</VersionBlock>
+
+ <VersionBlock firstVersion="1.10">
+  ## first version - 1.10
+</VersionBlock>

website/src/components/versionBlock/index.js

@@ -1,39 +1,25 @@
 import React, { useState, useEffect, useContext } from 'react'
 import VersionContext from '../../stores/VersionContext';
+import { availableInCurrentVersion } from '../../utils/available-in-current-version';
 
-export default function VersionBlock({ firstVersion = 0, lastVersion = undefined, children }) {
-  const { version } = useContext(VersionContext)
+export default function VersionBlock({ firstVersion = "0", lastVersion = undefined, children }) {
+  const { version } = useContext(VersionContext);
 
-  const [loading, setLoading] = useState(true)
+  const [loading, setLoading] = useState(true);
 
   // Hide versionBlock components until version ready
   useEffect(() => {
-    version && setLoading(false)
-  }, [version])
+    version && setLoading(false);
+  }, [version]);
 
   // Only check version if current version set
-  if(version) {
-    const currentVersionVal = parseFloat(version)
-    const firstVersionVal = parseFloat(firstVersion)
-    {/* 
-      * If last version set, check if current version greater than last version
-      * Or if current version less than first version
-      * If either is true, hide block
-      * Else, if current version less than first version, hide block
-    */}
-    if(lastVersion) {
-      if((currentVersionVal > parseFloat(lastVersion)) 
-      || (currentVersionVal < firstVersionVal))
-        return null
-    } else {
-      if(currentVersionVal < firstVersionVal) {
-        return null
-      }
-
-    }
+  if (version) {
+    if (!availableInCurrentVersion(
+      version, 
+      firstVersion, 
+      lastVersion
+    )) return null;
   }
 
-  return loading
-    ?  null
-    : <>{children}</>
+  return loading ? null : <>{children}</>;
 }

website/src/theme/DocRoot/Layout/Main/index.js

@@ -40,14 +40,17 @@
     version: dbtVersion,
     EOLDate,
     isPrerelease,
     latestStableRelease,
   } = useContext(VersionContext);
 
-  const { pageAvailable, firstAvailableVersion } = pageVersionCheck(
-    dbtVersion,
-    versionedPages,
-    currentDocRoute
-  );
+  const { 
+    pageAvailable, 
+    firstAvailableVersion, 
+    lastAvailableVersion 
+  } = pageVersionCheck(dbtVersion, versionedPages, currentDocRoute);
+
+  const hasFirstAvailableVersion =
+    firstAvailableVersion && firstAvailableVersion !== "0";
 
   // Check whether this version is a isPrerelease, and show banner if so
   const [PreData, setPreData] = useState({
@@ -116,21 +119,34 @@
           hiddenSidebarContainer && styles.docItemWrapperEnhanced
         )}
       >
-        {!pageAvailable && dbtVersion && firstAvailableVersion && (
-          <div className={styles.versionBanner}>
-            <Admonition type="caution" title={`New feature!`} icon="🎉 ">
-              <p style={{ marginTop: "5px", marginBottom: "0" }}>
-                Unfortunately, this feature is not available in dbt Core version{" "}
-                {dbtVersion}
-              </p>
-              <p>
-                {" "}
-                You should upgrade to {firstAvailableVersion} or later if you
-                want to use this feature.
-              </p>
-            </Admonition>
-          </div>
-        )}
+        {!pageAvailable &&
+          dbtVersion && (
+            <div className={styles.versionBanner}>
+              <Admonition
+                type="caution"
+                title={`${hasFirstAvailableVersion ? "New feature!" : lastAvailableVersion ? "Old feature" : "Note"}`}
+                icon={
+                  hasFirstAvailableVersion
+                    ? "🎉"
+                    : lastAvailableVersion
+                      ? "❗"
+                      : ""
+                }
+              >
+                <p style={{ marginTop: "5px", marginBottom: "0" }}>
+                  Unfortunately, this feature is not available in dbt Core
+                  version {dbtVersion}
+                </p>
+                {hasFirstAvailableVersion ? (
+                  <p>
+                    {" "}
+                    You should upgrade to {firstAvailableVersion} or later if
+                    you want to use this feature.
+                  </p>
+                ) : null}
+              </Admonition>
+            </div>
+          )}
         {PreData.showisPrereleaseBanner && (
           <div className={styles.versionBanner}>
             <Admonition type="caution" title="Warning">

website/src/theme/MDXComponents/index.js

@@ -27,7 +27,6 @@ import Snippet from '@site/src/components/snippet';
 import YoutubeVideo from '@site/src/components/youtube';
 import WistiaVideo from '@site/src/components/wistia';
 import VersionBlock from '@site/src/components/versionBlock';
-import Var from '@site/src/components/variable';
 import Term from '@site/src/components/term';
 import EventsFeed from '@site/src/components/events';
 import { DiscourseFeed, DiscourseHelpFeed } from '@site/src/components/discourse';
@@ -84,7 +83,6 @@ const MDXComponents = {
   WHCode: WHCode,
   YoutubeVideo: YoutubeVideo,
   VersionBlock: VersionBlock,
-  Var: Var,
   Term: Term,
   EventsFeed: EventsFeed,
   DiscourseFeed: DiscourseFeed,