Skip to content

Beautiful Open-Source Form Builder

Enhance Docker Compose configuration and refactor feature flag fetching

JhumanJ7332ef978f30
diff --git a/client/plugins/feature-flags.client.js b/client/plugins/feature-flags.client.js
index 44dc01ff9..11c58886b 100644
--- a/client/plugins/feature-flags.client.js
+++ b/client/plugins/feature-flags.client.js
@@ -1,3 +1,5 @@
+import { contentApi } from '~/api/content'
+
export default defineNuxtPlugin((nuxtApp) => {
// Access the same state that was set on server
const featureFlagsState = useState('featureFlags', () => ({}))
@@ -6,7 +8,9 @@ export default defineNuxtPlugin((nuxtApp) => {
nuxtApp.provide('refreshFeatureFlags', async () => {
try {
// Force fresh fetch by adding cache-busting timestamp
- const flags = await $fetch(`/api/feature-flags?t=${Date.now()}`)
+ const flags = await contentApi.featureFlags.list({
+ query: { t: Date.now() }
+ })
featureFlagsState.value = flags
return flags
} catch (error) {
diff --git a/client/plugins/feature-flags.server.js b/client/plugins/feature-flags.server.js
index 60d86f301..6a1cb0027 100644
--- a/client/plugins/feature-flags.server.js
+++ b/client/plugins/feature-flags.server.js
@@ -1,9 +1,11 @@
+import { contentApi } from '~/api/content'
+
export default defineNuxtPlugin(async (nuxtApp) => {
// Load feature flags during SSR using cached server route
const featureFlagsState = useState('featureFlags', () => ({}))
try {
- const flags = await $fetch('/api/feature-flags')
+ const flags = await contentApi.featureFlags.list({ server: true })
featureFlagsState.value = flags
} catch (error) {
console.error('Failed to load feature flags on server:', error)
@@ -14,7 +16,9 @@ export default defineNuxtPlugin(async (nuxtApp) => {
nuxtApp.provide('refreshFeatureFlags', async () => {
try {
// Force fresh fetch by adding cache-busting timestamp
- const flags = await $fetch(`/api/feature-flags?t=${Date.now()}`)
+ const flags = await contentApi.featureFlags.list({
+ query: { t: Date.now() }
+ })
featureFlagsState.value = flags
return flags
} catch (error) {
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 96c8a52de..75a9c84a2 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -52,6 +52,9 @@ services:
ui:
image: jhumanj/opnform-client:dev
container_name: opnform-client
+ depends_on:
+ api:
+ condition: service_started
command: sh -c "
if [ ! -f node_modules/.install-complete ] || [ package.json -nt node_modules/.install-complete ]; then
echo 'Installing dependencies...';
diff --git a/docker-compose.yml b/docker-compose.yml
index a50cc5ea0..48fcec12c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,6 +71,9 @@ services:
container_name: opnform-client
env_file:
- ./client/.env
+ depends_on:
+ api:
+ condition: service_healthy
healthcheck:
test:
["CMD-SHELL", "wget --spider -q http://localhost:3000/login || exit 1"]