Fix more links (#2520)

nkdAgility · Nov 20, 2024 · 28fc3d7 · 28fc3d7
2 parents a766b79 + 36c41e5
commit 28fc3d7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 45 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -128,9 +128,9 @@ jobs:
                 "Preview" {
                     $Ring = "Preview";
                     $WingetApplicationId = "nkdagility.azure-devops-migration-tools.Preview";
-                    $docs_deploy_folder = "./azure-devops-migration-tools/preview/";
-                    $docs_baseURL = "/learn/azure-devops-migration-tools/preview"
-                    $docs_baseURL_AFD = ""
+                    $docs_deploy_folder = "./azure-devops-migration-tools/";
+                    $docs_baseURL = "/learn/azure-devops-migration-tools"
+                    $docs_baseURL_AFD = "/learn/azure-devops-migration-tools"
                     $AzureSitesEnvironment = "preview";
                     $RunRelease = ( ('${{ inputs.ForceRelease }}' -eq 'true' ) -or ('${{ steps.filter.outputs.src }}' -eq 'true') -or ('${{ steps.filter.outputs.docs }}' -eq 'true') )
                 }
@@ -388,17 +388,6 @@ jobs:
       - uses: igsekor/pyspelling-any@v1.0.4
         id: spellcheck
         name: Spellcheck
-      - name: Build with Jekyll
-        # Outputs to the './_site' directory by default
-        run: bundle exec jekyll build --baseurl "${{needs.Setup.outputs.nkdAgility_DocsBaseURL}}"
-        env:
-          JEKYLL_ENV: production
-      # - name: Build Jekyll
-      #   uses: jerryjvl/jekyll-build-action@v1
-      - uses: actions/upload-artifact@v4
-        with:
-          name: AzureDevOpsMigrationTools-Site
-          path: ./_site/**/*
       - name: Build with Jekyll 2
         # Outputs to the './_site' directory by default
         run: bundle exec jekyll build --destination ./_site2/  --baseurl "${{needs.Setup.outputs.nkdAgility_DocsBaseURL_AFD}}"
@@ -585,38 +574,18 @@ jobs:
       - name: Download a single artifact
         uses: actions/download-artifact@v4
         with:
-          name: AzureDevOpsMigrationTools-Site
-          path: ./_site
+          name: AzureDevOpsMigrationTools-Site2
+          path: ./_site2
       - name: "Find  files"
         shell: pwsh
         run: |
             Get-Item -Path .\         
-      - name: SFTP Upload ${{ (needs.Setup.outputs.nkdAgility_Ring) }}
-        uses: Dylan700/sftp-upload-action@latest
-        with:
-          server: nakedalmweb.sftp.wpengine.com
-          username: nakedalmweb-learn
-          password: ${{ secrets.NKDAGILITY_LEARN_SFTP }}
-          port: 2222
-          # If true, outputs the results of the upload, without actually uploading.
-          #dry-run: ${{ (needs.Setup.outputs.nkdAgility_Ring) == 'Canary' }}
-          # A list of folders to upload in the format of `folder/ => upload_folder/`
-          uploads: | 
-              ./_site/ => ${{needs.Setup.outputs.nkdAgility_DocsDeployFolder}}
-          # If true, any existing files in the remote upload directories are deleted.
-          delete: false
-
       - uses: actions/create-github-app-token@v1
         id: app-token
         with:
           app-id: ${{ secrets.NKDAGILITY_BOT_APP_ID }}
           private-key: ${{ secrets.NKDAGILITY_BOT_CLIENTSECRET }}
 
-      - name: Download a single artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: AzureDevOpsMigrationTools-Site2
-          path: ./_site2
       - name: Build and Deploy
         uses: Azure/static-web-apps-deploy@v1
         id: azureDeploy

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
@@ -31,7 +31,7 @@
                     <div class="d-flex w-100 justify-content-between">
                         <div class="d-flex">
                             <a class="navbar-brand" href="#">
-                                <img src="https://nkdagility.com/wp-content/uploads/2020/11/nkdagility-with-martin-hinshelwood-light.png" alt="Naked Agility Ltd" width="234" height="99">
+                                <img src="/images/nkdagility-with-martin-hinshelwood-light.png" alt="Naked Agility Ltd" width="234" height="99">
                             </a>
                         </div>
                         <div class="d-flex text-uppercase align-items-center">
@@ -56,7 +56,7 @@ <h2>v#{GitVersion.SemVer}#</h2>
         <div class="col-lg-6 col-md-12">
             <p class="lead">{{site.description}}</p>
             <div class="d-grid gap-2 d-md-flex justify-content-md-end">
-                <a class="btn btn-nkdprimary" role="button" href="https://nkdagility.com/capabilities/azure-devops-migration-services/">Azure DevOps Migration Services</a>
+                <a class="btn btn-nkdprimary" role="button" href="{{site.parent_url}}/capabilities/azure-devops-migration-services/">Azure DevOps Migration Services</a>
             </div>
         </div>
     </div>

diff --git a/docs/_includes/sidebar.html b/docs/_includes/sidebar.html
@@ -8,14 +8,14 @@
                 <li><a href="{{site.baseurl}}/setup/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">Overview</a></li>
                 <li><a href="{{site.baseurl}}/setup/installation/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">Installation</a></li>
                 <li><a href="{{site.baseurl}}/setup/permissions/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">Permissions</a></li>
-                <li><a href="{{site.baseurl}}/setup/reflectedworkItemid/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">ReflectedWorkItemId</a></li>
+                <li><a href="{{site.baseurl}}/setup/reflectedworkitemid/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">ReflectedWorkItemId</a></li>
             </ul>
         </li>
         <li><hr /></li>
         <li class="mb-1">
             <strong class="bd-links-heading d-flex w-100 align-items-center fw-semibold">Getting Started</strong>
             <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small ps-2">
-                <li><a href="{{site.baseurl}}/getting-started/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">Overview</a></li>
+                <li><a href="{{site.baseurl}}/getstarted/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">Overview</a></li>
                 <li><a href="{{site.baseurl}}/version-control/" class="link-body-emphasis d-inline-flex text-decoration-none rounded">Version Control</a></li>
             </ul>
         </li>

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -58,7 +58,7 @@
             </div>
             <div class="p-2 flex-fill d-none d-xl-block" style="min-width: 15vw;max-width: 20vw;">
                 <div class="card mb-3">
-                    <img src="{{ site.baseurl }}/assets/images/Azure-DevOps-Migration-Tools-GithubSocial-Image.jpg" class="card-img-top" alt="...">
+                    <img src="{{site.baseurl}}/assets/images/Azure-DevOps-Migration-Tools-GithubSocial-Image.jpg" class="card-img-top" alt="...">
                     <div class="card-body">
                         <ul class="list-group list-group-flush">
                             <li class="list-group-item d-flex justify-content-center align-items-center">
@@ -80,12 +80,11 @@
                                 <ul class="list-group">
                                     <li class="list-group-item">
                                         <i class="fas fa-question-circle"></i>
-                                        <a href="{{site.baseurl}}" class="ml-2" target="_blank">v#{GitVersion.SemVer}#</a> (latest)
+                                        <a href="https://nkdagility.com/learn/azure-devops-migration-tools{{page.url}}" class="ml-2" target="_blank">Release</a>  (<a href="https://blue-river-093197403.5.azurestaticapps.net/{{page.url}}" rel="nofollow noindex" class="ml-2" target="_blank">without AFD</a>)
                                     </li>
                                     <li class="list-group-item">
                                         <i class="fab fa-twitter"></i>
-                                        <a href="{{site.baseurl}}/docs/v15.2.0" class="ml-2" target="_blank">v15.2.0</a> (unsupported)
-                                    </li>
+                                        <a href="https://preview.nkdagility.com/learn/azure-devops-migration-tools{{page.url}}" rel="nofollow noindex" class="ml-2" target="_blank">Preview</a> (<a href="https://blue-river-093197403-preview.westeurope.5.azurestaticapps.net{{page.url}}" rel="nofollow noindex" class="ml-2" target="_blank">without AFD</a>)</li>
                                 </ul>
                             </li>
                         </ul>

diff --git a/docs/index.md b/docs/index.md
@@ -54,7 +54,7 @@ For the most part we support moving data between `((Azure DevOps Server | Team F
 
 - [Installation](/setup/installation.md)
 - [Permissions](/setup/permissions.md)
-- [Getting Started](/getting-started/index.md)
+- [Getting Started](/getstarted/)
 - [Configuration Reference](./Reference/)
 - [FAQ](faq.md)
 - [Support](support.md)

diff --git a/docs/setup/reflectedworkitemid.md b/docs/setup/reflectedworkitemid.md
@@ -5,6 +5,7 @@ pageType: index
 pageStatus: published
 redirect_from:
   - /Reference/ReflectedWorkItemId/
+  - /server-configuration/
 ---
 
 The Azure DevOps migrations Tools has no internal state, and uses a field on the work item to track the migration of work items. This field is always referd to in the docs as `ReflectedWorkItemId` and is used to track the work item in the target. It enables the ability to resume migrations as well as to be able to scope the work items based on a query and have multiple runs overlap.