Merge branch 'feat/openproject-claude-integration' into develop

Author: pmigueld

packages/admin/src/api/index.ts

@@ -210,8 +210,10 @@ export const getUsers = async (): Promise<{ id: string; email: string; role: str
   return response.data
 }
 
-export const createUser = async (user: { email: string; password: string; role: string; tenantIds?: string[] }) => {
-  const response = await api().post(USERS_URL, user)
+export const createUser = async (user: { email: string; password: string; role: string; programIds?: string[] }) => {
+  // Backend still expects tenantIds
+  const { programIds, ...rest } = user
+  const response = await api().post(USERS_URL, { ...rest, tenantIds: programIds })
   return response.data
 }
 
@@ -220,9 +222,11 @@ export const updateUser = async (user: {
   email: string
   password?: string
   role: string
-  tenantIds?: string[]
+  programIds?: string[]
 }) => {
-  const response = await api().put(`${USERS_URL}/${user.id}`, user)
+  // Backend still expects tenantIds
+  const { programIds, ...rest } = user
+  const response = await api().put(`${USERS_URL}/${user.id}`, { ...rest, tenantIds: programIds })
   return response.data
 }
 
@@ -306,7 +310,7 @@ export interface ReviewFormData {
 export interface ReviewRecord {
   id: string
   submissionGuid: string
-  tenantId: string
+  programId: string
   status: 'pending' | 'approved' | 'rejected'
   submittedBy: string
   reviewedBy: string | null
@@ -326,55 +330,71 @@ export interface ReviewConfigRecord {
 }
 
 export const getReviews = async (
-  tenantId: string,
+  programId: string,
   status?: 'pending' | 'approved' | 'rejected',
 ): Promise<{ reviews: ReviewRecord[] }> => {
-  const params: Record<string, string> = { tenantId }
+  // Backend still expects tenantId
+  const params: Record<string, string> = { tenantId: programId }
   if (status) {
     params.status = status
   }
   const response = await api().get(REVIEWS_URL, { params })
-  return response.data
+  const data = response.data as { reviews: Array<Record<string, unknown>> }
+  return {
+    reviews: data.reviews.map(({ tenantId: tid, ...rest }) => ({
+      ...rest,
+      programId: tid,
+    })) as ReviewRecord[],
+  }
 }
 
 export const approveReview = async (
   id: string,
-  tenantId: string,
+  programId: string,
 ): Promise<{ review: ReviewRecord }> => {
-  const response = await api().post(`${REVIEWS_URL}/${id}/approve`, { tenantId })
-  return response.data
+  // Backend still expects tenantId
+  const response = await api().post(`${REVIEWS_URL}/${id}/approve`, { tenantId: programId })
+  const data = response.data as { review: Record<string, unknown> }
+  const { tenantId: tid, ...rest } = data.review
+  return { review: { ...rest, programId: tid } as ReviewRecord }
 }
 
 export const rejectReview = async (
   id: string,
-  tenantId: string,
+  programId: string,
   reason: string,
 ): Promise<{ review: ReviewRecord }> => {
-  const response = await api().post(`${REVIEWS_URL}/${id}/reject`, { tenantId, reason })
-  return response.data
+  // Backend still expects tenantId
+  const response = await api().post(`${REVIEWS_URL}/${id}/reject`, { tenantId: programId, reason })
+  const data = response.data as { review: Record<string, unknown> }
+  const { tenantId: tid, ...rest } = data.review
+  return { review: { ...rest, programId: tid } as ReviewRecord }
 }
 
 export const bulkApproveReviews = async (
   reviewIds: string[],
-  tenantId: string,
+  programId: string,
 ): Promise<{ approved: number; failed: number; errors: Array<{ reviewId: string; error: string }> }> => {
-  const response = await api().post(`${REVIEWS_URL}/bulk-approve`, { reviewIds, tenantId })
+  // Backend still expects tenantId
+  const response = await api().post(`${REVIEWS_URL}/bulk-approve`, { reviewIds, tenantId: programId })
   return response.data
 }
 
 export const getReviewConfigs = async (
-  tenantId: string,
+  programId: string,
 ): Promise<{ configs: ReviewConfigRecord[] }> => {
-  const response = await api().get(`${REVIEWS_URL}/config/${tenantId}`)
+  // Backend URL still uses tenantId path segment
+  const response = await api().get(`${REVIEWS_URL}/config/${programId}`)
   return response.data
 }
 
 export const setReviewConfig = async (
-  tenantId: string,
+  programId: string,
   eventType: string,
   config: { policy: string; requiredRole?: string; externalAdapterType?: string },
 ): Promise<{ status: string; config: ReviewConfigRecord }> => {
-  const response = await api().put(`${REVIEWS_URL}/config/${tenantId}/${eventType}`, config)
+  // Backend URL still uses tenantId path segment
+  const response = await api().put(`${REVIEWS_URL}/config/${programId}/${eventType}`, config)
   return response.data
 }
 
@@ -464,9 +484,20 @@ export const getCurrentUser = async (): Promise<{
   id: string
   email: string
   role: string
-  tenantIds: string[]
-  roleAssignments?: Array<{ tenantId: string; role: string; areaId?: string }>
+  programIds: string[]
+  roleAssignments?: Array<{ programId: string; role: string; areaId?: string }>
 }> => {
   const response = await api().get(`${USERS_URL}/me`)
-  return response.data
+  const data = response.data
+  // Backend returns tenantIds/tenantId — map to programIds/programId
+  return {
+    ...data,
+    programIds: data.tenantIds ?? data.programIds ?? [],
+    roleAssignments: data.roleAssignments?.map(
+      ({ tenantId: tid, ...rest }: { tenantId?: string; programId?: string; role: string; areaId?: string }) => ({
+        ...rest,
+        programId: tid ?? rest.programId,
+      }),
+    ),
+  }
 }

packages/admin/src/stores/__tests__/reviews.spec.ts

@@ -23,7 +23,7 @@ function makeReview(overrides: Partial<ReviewRecord> = {}): ReviewRecord {
   return {
     id: 'review-1',
     submissionGuid: 'sub-1',
-    tenantId: 'tenant-1',
+    programId: 'tenant-1',
     status: 'pending',
     submittedBy: 'user-1',
     reviewedBy: null,

packages/admin/src/views/AppDetailsView.vue

@@ -376,13 +376,26 @@ const triggerSync = async (credentials?: { username: string; password: string })
 
   try {
     isSyncing.value = true
-    await externalSyncApi(app.value.id, credentials)
-    snackBarStore.showSnackbar('External sync completed successfully', 'success')
+    const result = await externalSyncApi(app.value.id, credentials)
+    const pushed = result?.pushed ?? 0
+    const pulled = result?.pulled ?? 0
+    snackBarStore.showSnackbar(
+      `External sync completed: ${pushed} pushed, ${pulled} pulled`,
+      'success',
+    )
     // Refresh the page data after successful sync
     await fetchApp()
   } catch (err) {
-    console.error('Failed to sync collection program', err)
-    snackBarStore.showSnackbar('Failed to trigger external sync', 'red')
+    if (err instanceof AxiosError && err.response?.status === 409) {
+      snackBarStore.showSnackbar('A sync is already in progress. Please wait.', 'warning')
+    } else if (err instanceof AxiosError && err.response?.status === 422) {
+      const failed = err.response.data?.failed ?? 0
+      snackBarStore.showSnackbar(`Sync completed with ${failed} failure(s)`, 'warning')
+      await fetchApp()
+    } else {
+      console.error('Failed to sync collection program', err)
+      snackBarStore.showSnackbar('Failed to trigger external sync', 'red')
+    }
   } finally {
     isSyncing.value = false
   }

packages/admin/src/views/ReviewConfigView.vue

@@ -29,7 +29,7 @@ const router = useRouter()
 const reviewsStore = useReviewsStore()
 const snackBarStore = useSnackBarStore()
 
-const tenantId = ref(route.params.id as string)
+const programId = ref(route.params.id as string)
 const loading = ref(false)
 
 const policyOptions = [
@@ -67,7 +67,7 @@ const saveConfig = async () => {
   if (!editingConfig.value) return
   loading.value = true
   try {
-    await reviewsStore.updateConfig(tenantId.value, editingConfig.value.eventType, {
+    await reviewsStore.updateConfig(programId.value, editingConfig.value.eventType, {
       policy: editPolicy.value,
       requiredRole: editPolicy.value === 'internal-review' ? editRequiredRole.value : undefined,
     })
@@ -82,13 +82,13 @@ const saveConfig = async () => {
 }
 
 const goBack = () => {
-  router.push({ name: 'app-details', params: { id: tenantId.value } })
+  router.push({ name: 'app-details', params: { id: programId.value } })
 }
 
 onMounted(async () => {
   loading.value = true
   try {
-    await reviewsStore.fetchConfigs(tenantId.value)
+    await reviewsStore.fetchConfigs(programId.value)
   } catch (error) {
     snackBarStore.showSnackbar('Failed to load review configurations', 'error')
     console.error('Failed to load configs', error)

packages/admin/src/views/ReviewsView.vue

@@ -27,8 +27,8 @@ import { useSnackBarStore } from '@/stores/snackBar'
 const reviewsStore = useReviewsStore()
 const snackBarStore = useSnackBarStore()
 
-const tenants = ref<AppListItem[]>([])
-const selectedTenantId = ref<string | null>(null)
+const programs = ref<AppListItem[]>([])
+const selectedProgramId = ref<string | null>(null)
 const selectedStatus = ref<string | null>(null)
 const selectedReviewIds = ref<string[]>([])
 const showRejectDialog = ref(false)
@@ -124,19 +124,19 @@ const displayedReviews = computed(() => {
 
 const hasSelectedReviews = computed(() => selectedReviewIds.value.length > 0)
 
-const loadTenants = async () => {
+const loadPrograms = async () => {
   try {
     const response = await getApps()
-    tenants.value = response.data
+    programs.value = response.data
   } catch (error) {
-    console.error('Failed to load tenants', error)
+    console.error('Failed to load programs list', error)
   }
 }
 
 const loadReviews = async () => {
-  if (!selectedTenantId.value) return
+  if (!selectedProgramId.value) return
   try {
-    await reviewsStore.fetchReviews(selectedTenantId.value)
+    await reviewsStore.fetchReviews(selectedProgramId.value)
   } catch (error) {
     snackBarStore.showSnackbar('Failed to load reviews', 'error')
     console.error('Failed to load reviews', error)
@@ -184,13 +184,13 @@ const handleBulkApprove = async () => {
   }
 }
 
-watch(selectedTenantId, () => {
+watch(selectedProgramId, () => {
   selectedReviewIds.value = []
   loadReviews()
 })
 
 onMounted(() => {
-  loadTenants()
+  loadPrograms()
 })
 </script>
 
@@ -217,8 +217,8 @@ onMounted(() => {
     <v-row class="mb-4" align="center">
       <v-col cols="12" md="5">
         <v-select
-          v-model="selectedTenantId"
-          :items="tenants"
+          v-model="selectedProgramId"
+          :items="programs"
           item-title="name"
           item-value="id"
           label="Select Collection Program"
@@ -242,12 +242,12 @@ onMounted(() => {
       </v-col>
     </v-row>
 
-    <v-alert v-if="!selectedTenantId" type="info" variant="tonal" class="mb-4">
+    <v-alert v-if="!selectedProgramId" type="info" variant="tonal" class="mb-4">
       Select a collection program to view its reviews.
     </v-alert>
 
     <v-data-table
-      v-if="selectedTenantId"
+      v-if="selectedProgramId"
       v-model="selectedReviewIds"
       :headers="headers"
       :items="displayedReviews"