feat(admin-ui): Add Orval Support for Progressive Migration from OpenAPI Generator

admin-ui/api-client.ts

@@ -0,0 +1,15 @@
+import Axios, { AxiosRequestConfig } from 'axios'
+
+export const AXIOS_INSTANCE = Axios.create({ baseURL: '' })
+
+export const customInstance = <T>(config: AxiosRequestConfig): Promise<T> => {
+  const source = Axios.CancelToken.source()
+  const promise = AXIOS_INSTANCE({ ...config, cancelToken: source.token }).then(({ data }) => data)
+
+  // @ts-ignore
+  promise.cancel = () => {
+    source.cancel('Query was cancelled by React Query')
+  }
+
+  return promise
+}

admin-ui/fix-orval-enums.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+const fs = require('fs')
+const path = require('path')
+const filePath = './jans_config_api_orval/src/JansConfigApi.ts'
+
+if (!fs.existsSync(filePath)) {
+  console.log('JansConfigApi.ts not found, skipping enum fixes')
+  process.exit(0)
+}
+
+let content = fs.readFileSync(filePath, 'utf8')
+
+// Fix malformed enum keys with unescaped single quotes
+// Pattern: 'KeyOps{value=\'text'} -> 'KeyOps{value=\'text\'}
+const finalContent = content.replace(
+  /('KeyOps\{value=\\')([^'\\]+)(')/g,
+  (match, prefix, value, suffix) => {
+    return `${prefix}${value}\\${suffix}`
+  },
+)
+
+if (finalContent !== content) {
+  fs.writeFileSync(filePath, finalContent)
+  console.log('✅ Fixed malformed enum keys in JansConfigApi.ts')
+} else {
+  console.log('✅ No enum fixes needed in JansConfigApi.ts')
+}

admin-ui/orval.config.ts

@@ -0,0 +1,23 @@
+import { defineConfig } from 'orval'
+
+export default defineConfig({
+  jans: {
+    input: {
+      target: './configApiSpecs.yaml',
+    },
+    output: {
+      mode: 'single',
+      target: './jans_config_api_orval/src/JansConfigApi.ts',
+      client: 'axios',
+      httpClient: 'axios',
+      mock: false,
+      prettier: true,
+      override: {
+        mutator: {
+          path: './api-client.ts',
+          name: 'customInstance',
+        },
+      },
+    },
+  },
+})

admin-ui/package.json

@@ -37,6 +37,8 @@
     "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,json}\"",
     "api": "rm -rf jans_config_api && openapi-merge-cli && openapi-generator-cli generate -i ./configApiSpecs.yaml --global-property skipFormModel=false -g javascript -o jans_config_api && cd jans_config_api && npm i mocha@10.2.0 && npm install && npm run build",
     "api-win": "del /f jans_config_api && openapi-merge-cli && openapi-generator-cli generate -i ./configApiSpecs.yaml --global-property skipFormModel=false -g javascript -o jans_config_api && cd jans_config_api && npm i mocha@10.2.0 && npm install && npm run build",
+    "api:orval": "rm -rf jans_config_api_orval && openapi-merge-cli && orval --config ./orval.config.ts && node fix-orval-enums.js",
+    "api:orval-win": "del /f /s /q jans_config_api_orval && openapi-merge-cli && orval --config ./orval.config.ts && node fix-orval-enums.js",
     "plugin:showAll": "node ./build/plugin-cli.js --showAllPlugins",
     "plugin:add": "node ./build/plugin-cli.js --addPlugin",
     "plugin:remove": "node ./build/plugin-cli.js --removePlugin",
@@ -104,6 +106,7 @@
     "lint-staged": "^16.0.0",
     "mini-css-extract-plugin": "^2.7.5",
     "mkdirp": "^2.1.6",
+    "orval": "^7.11.2",
     "postcss-loader": "^7.2.4",
     "prettier": "^3.5.3",
     "purgecss-webpack-plugin": "^5.0.0",