Merge branch 'v1.11' into v1.11-pubsub-doc-json-fix

.github/scripts/algolia.py

@@ -0,0 +1,118 @@
+import os
+from re import S
+import sys
+import json
+from bs4 import BeautifulSoup
+from algoliasearch.search_client import SearchClient
+
+url = "docs.dapr.io"
+if len(sys.argv) > 1:
+    starting_directory = os.path.join(os.getcwd(), str(sys.argv[1])) 
+else:
+    starting_directory = os.getcwd()
+
+ALGOLIA_APP_ID = os.getenv('ALGOLIA_APP_ID')
+ALGOLIA_API_KEY = os.getenv('ALGOLIA_API_WRITE_KEY')
+ALGOLIA_INDEX_NAME = os.getenv('ALGOLIA_INDEX_NAME')
+
+client = SearchClient.create(ALGOLIA_APP_ID, ALGOLIA_API_KEY)
+index = client.init_index(ALGOLIA_INDEX_NAME)
+
+excluded_files = [
+    "404.html",
+]
+
+exluded_directories = [
+    "zh-hans",
+]
+
+rankings = {
+    "Getting started": 0,
+    "Concepts": 100,
+    "Developing applications": 200,
+    "Operations": 300,
+    "Reference": 400,
+    "Contributing": 500,
+    "Home": 600
+}
+
+def scan_directory(directory: str, pages: list):
+    if os.path.basename(directory) in exluded_directories:
+        print(f'Skipping directory: {directory}')
+        return
+    for file in os.listdir(directory):
+        path = os.path.join(directory, file)
+        if os.path.isfile(path):
+            if file.endswith(".html") and file not in excluded_files:
+                if '<!-- DISABLE_ALGOLIA -->' not in open(path, encoding="utf8").read():
+                    print(f'Indexing: {path}')
+                    pages.append(path)
+                else:
+                    print(f'Skipping hidden page: {path}')
+        else:
+            scan_directory(path, pages)
+
+def parse_file(path: str):
+    data = {}
+    data["hierarchy"] = {}
+    data["rank"] = 999
+    data["subrank"] = 99
+    data["type"] = "lvl2"
+    data["lvl0"] = ""
+    data["lvl1"] = ""
+    data["lvl2"] = ""
+    data["lvl3"] = ""
+    text = ""
+    subrank = 0
+    with open(path, "r", errors='ignore') as file:
+        content = file.read()
+        soup = BeautifulSoup(content, "html.parser")
+    for meta in soup.find_all("meta"):
+        if meta.get("name") == "description":
+            data["lvl2"] = meta.get("content")
+            data["hierarchy"]["lvl1"] = meta.get("content")
+        elif meta.get("property") == "og:title":
+            data["lvl0"] = meta.get("content")
+            data["hierarchy"]["lvl0"] = meta.get("content")
+            data["hierarchy"]["lvl2"] = meta.get("content")
+        elif meta.get("property") == "og:url":
+            data["url"] = meta.get("content")
+            data["path"] = meta.get("content").split(url)[1]
+            data["objectID"] = meta.get("content").split(url)[1]
+    breadcrumbs = soup.find_all("li", class_="breadcrumb-item")
+    try:
+        subrank = len(breadcrumbs)
+        data["subrank"] = subrank
+    except:
+        subrank = 99
+        data["subrank"] = 99
+    for bc in breadcrumbs:
+        section = bc.text.strip()
+        data["lvl1"] = section
+        data["hierarchy"]["lvl0"] = section
+        try:
+            data["rank"] = rankings[section] + subrank
+        except:
+            print(f"Rank not found for section {section}")
+            data["rank"] = 998
+        break
+    for p in soup.find_all("p"):
+        if p.text != "":
+            text = text + p.text
+    data["text"] = text
+    return data
+
+def index_payload(payload):
+    res = index.replace_all_objects(payload)
+    res.wait()
+
+
+if __name__ == "__main__":
+    pages = []
+    payload = []
+    scan_directory(starting_directory, pages)
+    for page in pages:
+        data = parse_file(page)
+        if "objectID" in data:
+            payload.append(data)
+    index_payload(payload)

.github/workflows/website-root.yml

@@ -1,6 +1,7 @@
 name: Azure Static Web App Root
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - v1.11
@@ -9,35 +10,65 @@ on:
     branches:
       - v1.11
 
+concurrency:
+  # Cancel the previously triggered build for only PR build.
+  group: website-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    name: Build Hugo Website
+    if: github.event.action != 'closed'
     runs-on: ubuntu-latest
-    name: Build and Deploy Job
+    env:
+      SWA_BASE: 'proud-bay-0e9e0e81e'
+      HUGO_ENV: production
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout docs repo
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: Setup Hugo
+        uses: peaceiris/[email protected]
         with:
-          submodules: recursive
-          fetch-depth: 0
+          hugo-version: 0.102.3
+          extended: true
       - name: Setup Docsy
-        run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli
-      - name: Build And Deploy
-        id: builddeploy
+        run: |
+          cd daprdocs
+          git submodule update --init --recursive
+          sudo npm install -D --save autoprefixer
+          sudo npm install -D --save postcss-cli
+      - name: Build Hugo Website
+        run: |
+          cd daprdocs
+          git config --global --add safe.directory /github/workspace
+          if [ $GITHUB_EVENT_NAME == 'pull_request' ]; then
+            STAGING_URL="https://${SWA_BASE}-${{github.event.number}}.westus2.azurestaticapps.net/"
+          fi
+          hugo ${STAGING_URL+-b "$STAGING_URL"}
+      - name: Deploy docs site
         uses: Azure/static-web-apps-deploy@v1
-        env:
-          HUGO_ENV: production
-          HUGO_VERSION: "0.100.2"
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          skip_deploy_on_missing_secrets: true
-          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
           action: "upload"
-          app_location: "/daprdocs"
-          app_build_command: "git config --global --add safe.directory /github/workspace && hugo"
-          output_location: "public"
-          skip_api_build: true
+          app_location: "daprdocs/public/"
+          api_location: "daprdocs/public/" 
+          output_location: ""
+          skip_app_build: true
+      - name: Upload Hugo artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: hugo_build
+          path: ./daprdocs/public/
+          if-no-files-found: error
 
-  close_pull_request_job:
+  close_staging_site:
     if: github.event_name == 'pull_request' && github.event.action == 'closed'
     runs-on: ubuntu-latest
     name: Close Pull Request Job
@@ -48,3 +79,29 @@ jobs:
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
           action: "close"
+
+  algolia_index:
+    name: Index site for Algolia
+    if: github.event_name == 'push'
+    needs: ['build_and_deploy_job']
+    runs-on: ubuntu-latest
+    env:
+      ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
+      ALGOLIA_API_WRITE_KEY: ${{ secrets.ALGOLIA_API_WRITE_KEY }}
+      ALGOLIA_INDEX_NAME: daprdocs
+    steps:
+      - name: Checkout docs repo
+        uses: actions/checkout@v2
+        with:
+          submodules: false
+      - name: Download Hugo artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: hugo_build
+          path: site/
+      - name: Install Python packages
+        run: |
+          pip install --upgrade bs4
+          pip install --upgrade 'algoliasearch>=2.0,<3.0'
+      - name: Index site
+        run: python ./.github/scripts/algolia.py ./site

daprdocs/layouts/partials/hooks/body-end.html

@@ -1,19 +1,13 @@
+<script src="/js/copy-code-button.js"></script>
+
 {{ with .Site.Params.algolia_docsearch }}
-<script src="https://cdn.jsdelivr.net/npm/docsearch.js@2.6.3/dist/cdn/docsearch.min.js"></script>
-<script>
+<script src="https://cdn.jsdelivr.net/npm/@docsearch/js@3"></script>
+<script type="text/javascript">
   docsearch({
-    // Your apiKey and indexName will be given to you once
-    // we create your config
-    apiKey: '54ae43aa28ce8f00c54c8d5f544d29b9',
-    indexName: 'crawler_dapr',
+    container: '#docsearch',
     appId: 'O0QLQGNF38',
-    // Replace inputSelector with a CSS selector
-    // matching your search input
-    inputSelector: '.td-search-input',
-    // Set debug to true to inspect the dropdown
-    debug: false,
+    apiKey: '54ae43aa28ce8f00c54c8d5f544d29b9',
+    indexName: 'daprdocs',
   });
 </script>
 {{ end }}
-
-<script src="/js/copy-code-button.js"></script>

daprdocs/layouts/partials/hooks/head-end.html

@@ -1,3 +1,3 @@
 {{ with .Site.Params.algolia_docsearch }}
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3" />
 {{ end }}

daprdocs/layouts/partials/search-input.html

@@ -0,0 +1,30 @@
+{{ if .Site.Params.gcs_engine_id -}}
+<input type="search" class="form-control td-search-input" placeholder="&#xf002; {{ T "ui_search" }}" aria-label="{{ T "ui_search" }}" autocomplete="off">
+{{ else if .Site.Params.algolia_docsearch -}}
+<div id="docsearch"></div>
+{{ else if .Site.Params.offlineSearch -}}
+{{ $offlineSearchIndex := resources.Get "json/offline-search-index.json" | resources.ExecuteAsTemplate "offline-search-index.json" . -}}
+{{ if hugo.IsProduction -}}
+{{/* Use `md5` as finger print hash function to shorten file name to avoid `file name too long` error. */ -}}
+{{ $offlineSearchIndex = $offlineSearchIndex | fingerprint "md5" -}}
+{{ end -}}
+{{ $offlineSearchLink := $offlineSearchIndex.RelPermalink -}}
+
+<input
+  type="search"
+  class="form-control td-search-input"
+  placeholder="&#xf002; {{ T "ui_search" }}"
+  aria-label="{{ T "ui_search" }}"
+  autocomplete="off"
+  {{/*
+    The data attribute name of the json file URL must end with `src` since
+    Hugo's absurlreplacer requires `src`, `href`, `action` or `srcset` suffix for the attribute name.
+    If the absurlreplacer is not applied, the URL will start with `/`.
+    It causes the json file loading error when when relativeURLs is enabled.
+    https://github.com/google/docsy/issues/181
+  */}}
+  data-offline-search-index-json-src="{{ $offlineSearchLink }}"
+  data-offline-search-base-href="/"
+  data-offline-search-max-results="{{ .Site.Params.offlineSearchMaxResults | default 10 }}"
+>
+{{ end -}}