Merge branch 'main' of https://github.com/ClickHouse/clickhouse-docs into remove-hydra-limitation

Author: Blargian

docs/cloud/features/08_backups/backups-to-own-cloud/backup_restore_using_commands.md

@@ -56,9 +56,9 @@ See the [backup command summary](/operations/backup#command-summary) for full ba
 ```sql
 BACKUP DATABASE test_backups 
 TO S3(
-'https://testchbackups.s3.amazonaws.com/<uuid>',
-'<key id>',
-'<key secret>'
+  'https://testchbackups.s3.amazonaws.com/<uuid>',
+  '<key id>',
+  '<key secret>'
 )
 ```
 
@@ -74,9 +74,9 @@ For example, if you are taking daily backups, you will need to use a new uuid ea
 ```sql
 RESTORE DATABASE test_backups
 FROM S3(
-'https://testchbackups.s3.amazonaws.com/<uuid>',
-'<key id>',
-'<key secret>'
+  'https://testchbackups.s3.amazonaws.com/<uuid>',
+  '<key id>',
+  '<key secret>'
 )
 ```
   </TabItem>
@@ -89,9 +89,9 @@ FROM S3(
 ```sql
 BACKUP DATABASE test_backups 
 TO S3(
-'https://storage.googleapis.com/<bucket>/<uuid>',
-'<hmac-key>',
-'<hmac-secret>'
+  'https://storage.googleapis.com/<bucket>/<uuid>',
+  '<hmac-key>',
+  '<hmac-secret>'
 )
 ```
 
@@ -107,9 +107,9 @@ For example, if you are taking daily backups, you will need to use a new uuid ea
 ```sql
 RESTORE DATABASE test_backups
 FROM S3(
-'https://storage.googleapis.com/<bucket>/<uuid>',
-'<hmac-key>',
-'<hmac-secret>'
+  'https://storage.googleapis.com/<bucket>/<uuid>',
+  '<hmac-key>',
+  '<hmac-secret>'
 )
 ```
   </TabItem>
@@ -122,10 +122,9 @@ FROM S3(
 ```sql
 BACKUP DATABASE test_backups 
 TO AzureBlobStorage(
-'<AzureBlobStorage endpoint connection string>',
-'<container>',
-'<blob>/<>'
-);
+  '<AzureBlobStorage endpoint connection string>',
+  '<container>',
+  '<blob>/<>'
 )
 ```
 
@@ -140,9 +139,9 @@ For example, if you are taking daily backups, you will need to use a new uuid ea
 ```sql
 RESTORE DATABASE test_backups
 FROM AzureBlobStorage(
-'<AzureBlobStorage endpoint connection string>',
-'<container>',
-'<blob>/<uuid>'
+  '<AzureBlobStorage endpoint connection string>',
+  '<container>',
+  '<blob>/<uuid>'
 )
 ```
   </TabItem>

scripts/sed_links.sh

@@ -19,7 +19,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     sed -i '' 's|(/cloud/security/cloud-access-management/overview#initial-settings)|(/cloud/security/console-roles)|g' docs/sql-reference/statements/grant.md
     sed -i '' 's|(/cloud/security/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|(/cloud/data-sources/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|g' docs/sql-reference/table-functions/s3.md
     sed -i '' 's|(/cloud/security/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|(/cloud/data-sources/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|g' docs/sql-reference/table-functions/s3Cluster.md
-    sed -i '' 's|<auxiliary_zookeepers>|`<auxiliary_zookeepers>`|g' docs/operations/server-configuration-parameters/settings.md
+    sed -i '' 's|(#cuttofirstsignificantsubdomaincustom)|(#cutToFirstSignificantSubdomainCustom)|g' docs/sql-reference/functions/url-functions.md
 else
     # Linux
     sed -i 's|(../../quick-start\.mdx)|(/get-started/quick-start)|g' docs/operations/utilities/clickhouse-local.md
@@ -32,5 +32,5 @@ else
     sed -i 's|(/cloud/security/cloud-access-management/overview#initial-settings)|(/cloud/security/console-roles)|g' docs/sql-reference/statements/grant.md
     sed -i 's|(/cloud/security/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|(/cloud/data-sources/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|g' docs/sql-reference/table-functions/s3.md
     sed -i 's|(/cloud/security/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|(/cloud/data-sources/secure-s3#access-your-s3-bucket-with-the-clickhouseaccess-role)|g' docs/sql-reference/table-functions/s3Cluster.md
-    sed -i 's|<auxiliary_zookeepers>|`<auxiliary_zookeepers>`|g' docs/operations/server-configuration-parameters/settings.md
+    sed -i 's|(#cuttofirstsignificantsubdomaincustom)|(#cutToFirstSignificantSubdomainCustom)|g' docs/sql-reference/functions/url-functions.md
 fi

src/components/IntegrationGrid/IntegrationGrid.tsx

@@ -162,37 +162,72 @@ function useCMSIntegrations() {
 
   useEffect(() => {
     const fetchIntegrations = async () => {
+      // Step 1: Load fallback data first for immediate display
       try {
-        setLoading(true);
-        const response = await fetch('https://cms.clickhouse-dev.com:1337/api/integrations?populate[]=logo&populate[]=logo_dark');
+        const fallbackResponse = await fetch('/integrations-fallback.json', {
+          cache: 'force-cache' // Use cached version if available
+        });
+
+        if (fallbackResponse.ok) {
+          const fallbackData = await fallbackResponse.json();
+          const transformedData = transformCMSData(fallbackData.data || []);
+          setIntegrations(transformedData);
+          setError(null);
+          setLoading(false); // Show content immediately with fallback data
+          console.log('Loaded fallback integrations data');
+        } else {
+          console.warn('Fallback file not available, will try CMS only');
+        }
+      } catch (fallbackErr) {
+        console.error('Failed to load fallback integrations data:', fallbackErr);
+        // Continue to try CMS even if fallback fails
+      }
+
+      // Step 2: Try to fetch fresh data from CMS with timeout
+      try {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => {
+          controller.abort();
+          console.log('CMS request timed out after 8 seconds');
+        }, 8000); // 8 second timeout
+
+        const response = await fetch(
+          'https://cms.clickhouse-dev.com:1337/api/integrations?populate[]=logo&populate[]=logo_dark',
+          {
+            signal: controller.signal,
+            // Add headers to help with CORS and caching
+            headers: {
+              'Accept': 'application/json',
+            }
+          }
+        );
+
+        clearTimeout(timeoutId);
 
         if (!response.ok) {
           throw new Error(`HTTP error! status: ${response.status}`);
         }
 
         const data = await response.json();
         const transformedData = transformCMSData(data.data || []);
+
+        // Update with fresh CMS data
         setIntegrations(transformedData);
         setError(null);
-      } catch (err) {
-        console.error('Error loading integrations data from endpoint. Falling back to static JSON file.');
-
-        // Fallback to static JSON file
-        try {
-          const fallbackResponse = await fetch('/integrations-fallback.json');
-
-          if (!fallbackResponse.ok) {
-            throw new Error(`Failed to load fallback data: ${fallbackResponse.status}`);
+        console.log('Successfully updated with fresh CMS data');
+      } catch (cmsErr) {
+        // CMS fetch failed, but that's okay - we already have fallback data
+        if (cmsErr instanceof Error) {
+          if (cmsErr.name === 'AbortError') {
+            console.log('CMS request was aborted due to timeout, using fallback data');
+          } else {
+            console.error('Error loading integrations from CMS:', cmsErr.message);
           }
+        }
 
-          const fallbackData = await fallbackResponse.json();
-          const transformedData = transformCMSData(fallbackData.data || []);
-          setIntegrations(transformedData);
-          setError(null);
-        } catch (fallbackErr) {
-          console.error('Failed to load fallback integrations data:', fallbackErr);
-          setError(fallbackErr instanceof Error ? fallbackErr.message : 'Failed to fetch integrations');
-          setIntegrations([]);
+        // Only set error if we don't have any integrations data at all
+        if (integrations.length === 0) {
+          setError('Unable to load integrations. Please try refreshing the page.');
         }
       } finally {
         setLoading(false);

src/css/custom.scss

@@ -1161,6 +1161,10 @@ button.DocSearch {
     color: black !important;
 }
 
+[data-theme='dark'] .alert a {
+    color: black !important;
+}
+
 .theme-admonition-tip {
   &.alert--warning {
     .alert-icon {

vercel.json

@@ -3592,6 +3592,11 @@
       "source": "/docs/about-clickhouse",
       "destination": "/docs/intro",
       "permanent": true
+    },
+    {
+      "source": "/docs/cloud/security/inviting-new-users",
+      "destination": "/docs/cloud/security/manage-cloud-users#invite-users",
+      "permanent": true
     }
   ]
 }