Merge branch 'stable' into bkr-fix-semver-release-tasks

.github/workflows/ci.yml

@@ -684,9 +684,9 @@ jobs:
 
       - name: Add response delay if required
         if: needs.files-changed.outputs.e2e_tests == 'true'
-        run: echo "INFRAHUB_MISC_RESPONSE_DELAY=2" >> $GITHUB_ENV && invoke dev.start
+        run: echo "INFRAHUB_MISC_RESPONSE_DELAY=0" >> $GITHUB_ENV && invoke dev.start
         env:
-          INFRAHUB_MISC_RESPONSE_DELAY: 2
+          INFRAHUB_MISC_RESPONSE_DELAY: 0
 
       - name: Set infrahub address
         if: needs.files-changed.outputs.e2e_tests == 'true'

.github/workflows/release.yml

@@ -121,3 +121,10 @@ jobs:
     secrets: inherit
     with:
       publish: true
+
+  update-submodule:
+    needs: check_release
+    uses: ./.github/workflows/update-submodule.yml
+    secrets: inherit
+    with:
+      version: ${{ github.ref_name }}

.github/workflows/trigger-submodule.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Commit and push changes with github-actions-x/commit
         uses: github-actions-x/[email protected]
         with:
-          github-token: ${{ secrets.GH_UPDATE_PACKAGE }}
+          github-token: ${{ secrets.GH_UPDATE_PACKAGE_OTTO }}
           push-branch: ${{ env.BRANCH_NAME }}
           commit-message: "chore: update submodule ${{ env.SUBMODULE_PATH }} to version ${{ env.SDK_VERSION }}"
           files: ${{ env.SUBMODULE_PATH }}/

.github/workflows/update-submodule.yml

@@ -0,0 +1,44 @@
+---
+# yamllint disable rule:truthy rule:line-length
+name: Trigger Submodule update
+
+on:
+  workflow_dispatch:
+    inputs:
+      runs-on:
+        description: "The OS to run the job on"
+        required: false
+        default: "ubuntu-22.04"
+        type: string
+      version:
+        type: string
+        required: false
+        description: The string to extract semver from.
+        default: ''
+  workflow_call:
+    inputs:
+      runs-on:
+        description: "The OS to run the job on"
+        required: false
+        default: "ubuntu-22.04"
+        type: string
+      version:
+        type: string
+        required: false
+        description: The string to extract semver from.
+        default: ''
+
+jobs:
+  trigger-submodule:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Trigger submodule update
+        run: |
+          curl -X POST \
+            -H 'Authorization: token ${{ secrets.GH_UPDATE_PACKAGE_OTTO }}' \
+            -H 'Accept: application/vnd.github.v3+json' \
+            'https://api.github.com/repos/${{ secrets.INFRAHUB_ENTERPRISE_REPOSITORY }}/dispatches' \
+            -d '{"event_type":"trigger-submodule-update","client_payload":{"version":"${{ inputs.version }}"}}'

.vale/styles/spelling-exceptions.txt

@@ -116,6 +116,8 @@ validator
 upsert
 Upserting
 upserting
+uuid
+UUID
 validators
 Version Control
 Vitest

changelog/+schema-viewer.added.md

@@ -0,0 +1 @@
+In schema viewer, we now display `Hierarchical` value for generics.

changelog/+search-pagination-combobox.added.md

@@ -0,0 +1 @@
+Add pagination and backend search in new combobox for relationships

changelog/4850.fixed.md

@@ -0,0 +1 @@
+Consistently use "Save" on all object forms submit buttons

changelog/5099.fixed.md

@@ -0,0 +1 @@
+Correctly refresh menu after access token has expired

frontend/app/biome.json

@@ -7,9 +7,10 @@
       "./coverage",
       "./dist",
       "./playwright-report",
-      "./src/generated",
       "./test-results",
-      "./tests/e2e/.auth"
+      "./tests/e2e/.auth",
+      "./src/generated",
+      "./src/infraops.d.ts"
     ]
   },
   "formatter": {

frontend/app/package.json

@@ -25,7 +25,7 @@
     "cypress:run:component": "cypress run --component",
     "cypress:run:spec": "ELECTRON_ENABLE_LOGGING=1 cypress run --spec",
     "biome": "biome check .",
-    "biome:fix": "biome check --apply ."
+    "biome:fix": "biome check --write ."
   },
   "dependencies": {
     "@apollo/client": "^3.9.10",
@@ -53,6 +53,8 @@
     "@radix-ui/react-tooltip": "^1.0.7",
     "@svgr/rollup": "^8.1.0",
     "@tailwindcss/forms": "^0.5.7",
+    "@tanstack/react-query": "^5.62.3",
+    "@tanstack/react-query-devtools": "^5.62.3",
     "@uiw/react-color": "^2.1.1",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.19",
@@ -68,6 +70,7 @@
     "handlebars": "^4.7.8",
     "jotai": "^2.10.0",
     "json-to-graphql-query": "^2.2.5",
+    "openapi-fetch": "^0.13.3",
     "prismjs": "^1.29.0",
     "query-string": "^9.0.0",
     "ramda": "^0.29.1",
@@ -117,7 +120,7 @@
     "cypress": "^13.15.0",
     "jsdom": "^24.0.0",
     "lint-staged": "^15.2.10",
-    "openapi-typescript": "^7.0.2",
+    "openapi-typescript": "^7.4.4",
     "postcss": "^8.4.23",
     "react-test-renderer": "^18.2.0",
     "tailwindcss": "^3.4.3",

frontend/app/playwright.config.ts

@@ -18,11 +18,12 @@ export default defineConfig({
   /* Retry on CI only */
   retries: process.env.CI ? 1 : 0,
   /* 30s timeout for both assertions and tests (2min in CI) */
-  timeout: process.env.CI
-    ? process.env.INFRAHUB_MISC_RESPONSE_DELAY
-      ? 6 * 60 * 1000
-      : 2 * 60 * 1000
-    : 30 * 1000,
+  // timeout: process.env.CI
+  //   ? process.env.INFRAHUB_MISC_RESPONSE_DELAY
+  //     ? 6 * 60 * 1000
+  //     : 2 * 60 * 1000
+  //   : 30 * 1000,
+  timeout: process.env.CI ? 2 * 60 * 1000 : 30 * 1000,
   expect: {
     timeout: process.env.CI
       ? process.env.INFRAHUB_MISC_RESPONSE_DELAY

frontend/app/src/App.tsx

@@ -11,9 +11,12 @@ import { store } from "@/state";
 import { ApolloProvider } from "@apollo/client";
 import { addCollection } from "@iconify-icon/react";
 import mdiIcons from "@iconify-json/mdi/icons.json";
+import { QueryClientProvider } from "@tanstack/react-query";
 
 import "./styles/index.css";
 import "react-toastify/dist/ReactToastify.css";
+import { queryClient } from "@/api/client";
+import { TanStackQueryDevtools } from "@/devtools";
 
 addCollection(mdiIcons);
 
@@ -22,17 +25,20 @@ export function App() {
     <ErrorBoundary FallbackComponent={ErrorFallback}>
       <Provider store={store}>
         <AuthProvider>
-          <ApolloProvider client={graphqlClient}>
-            <ToastContainer
-              hideProgressBar={true}
-              transition={Slide}
-              autoClose={5000}
-              closeOnClick={false}
-              newestOnTop
-              position="bottom-right"
-            />
-            <RouterProvider router={router} />
-          </ApolloProvider>
+          <QueryClientProvider client={queryClient}>
+            <ApolloProvider client={graphqlClient}>
+              <ToastContainer
+                hideProgressBar={true}
+                transition={Slide}
+                autoClose={5000}
+                closeOnClick={false}
+                newestOnTop
+                position="bottom-right"
+              />
+              <RouterProvider router={router} />
+            </ApolloProvider>
+            <TanStackQueryDevtools buttonPosition="bottom-left" />
+          </QueryClientProvider>
         </AuthProvider>
       </Provider>
     </ErrorBoundary>