@nuxt-customer-portal/service-requests 0.3.0 → 0.3.2

package/app/pages/requests/new.vue

@@ -29,9 +29,15 @@ const handleSubmit = async (data: ServiceRequestCreateInput) => {
 </script>
 
 <template>
-  <div class="container mx-auto py-8 max-w-2xl">
-    <h1 class="text-3xl font-bold mb-6">{{ t('features.serviceRequests.create') }}</h1>
+  <div class="mx-auto h-full min-h-0 w-full max-w-3xl overflow-y-auto px-4 py-5 sm:px-6">
+    <UButton to="/requests" icon="i-lucide-arrow-left" color="neutral" variant="ghost" class="mb-4">{{
+      t('features.serviceRequests.actions.back')
+    }}</UButton>
+    <h1 class="mb-2 flex items-center gap-3 text-xl font-semibold">
+      <UIcon name="i-lucide-ticket" class="size-5 text-primary" />{{ t('features.serviceRequests.create') }}
+    </h1>
 
-    <CustomerRequestForm :loading="loading" @submit="handleSubmit" @cancel="navigateTo('/requests')" />
+    <p class="mb-6 text-sm text-muted">{{ t('features.serviceRequests.list.createDescription') }}</p>
+    <UCard><CustomerRequestForm :loading="loading" @submit="handleSubmit" @cancel="navigateTo('/requests')" /></UCard>
   </div>
 </template>

package/i18n/locales/en.json

@@ -91,7 +91,28 @@
         "empty": "No service requests found",
         "endOfList": "You've reached the end"
       },
-      "confirmDelete": "Are you sure you want to delete this service request? This action cannot be undone."
+      "confirmDelete": "Are you sure you want to delete this service request? This action cannot be undone.",
+      "list": {
+        "description": "Share requests, follow progress and keep track of the work for your organization.",
+        "adminDescription": "Triage requests, set priorities and coordinate the work across your clients.",
+        "search": "Search requests…",
+        "noMatches": "No matching requests",
+        "noMatchesDescription": "Try another search or adjust your filters.",
+        "emptyTitle": "No service requests yet",
+        "emptyDescription": "Create a request to share a question, report an issue or suggest an improvement.",
+        "createFirst": "Create your first request",
+        "createDescription": "Describe what you need and add enough context for the team to get started.",
+        "loadPrevious": "Load previous requests",
+        "unassigned": "Unassigned",
+        "previousAssignee": "Previously assigned team member"
+      },
+      "validation": {
+        "client": "Select a client.",
+        "title": "Enter a title between 3 and 200 characters.",
+        "description": "Enter a description between 10 and 5,000 characters.",
+        "category": "Use no more than 100 characters.",
+        "notes": "Use no more than 5,000 characters."
+      }
     }
   }
 }

package/i18n/locales/nl.json

@@ -91,7 +91,28 @@
         "empty": "Geen serviceaanvragen gevonden",
         "endOfList": "Je hebt het einde bereikt"
       },
-      "confirmDelete": "Weet je zeker dat je deze serviceaanvraag wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt."
+      "confirmDelete": "Weet je zeker dat je deze serviceaanvraag wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
+      "list": {
+        "description": "Deel verzoeken, volg de voortgang en houd overzicht over het werk voor uw organisatie.",
+        "adminDescription": "Beoordeel verzoeken, stel prioriteiten en coördineer het werk voor uw klanten.",
+        "search": "Zoek verzoeken…",
+        "noMatches": "Geen overeenkomende verzoeken",
+        "noMatchesDescription": "Probeer een andere zoekterm of pas uw filters aan.",
+        "emptyTitle": "Nog geen serviceverzoeken",
+        "emptyDescription": "Maak een verzoek aan om een vraag te stellen, een probleem te melden of een verbetering voor te stellen.",
+        "createFirst": "Maak uw eerste verzoek",
+        "createDescription": "Beschrijf wat u nodig heeft en geef het team voldoende informatie om te beginnen.",
+        "loadPrevious": "Eerdere verzoeken laden",
+        "unassigned": "Niet toegewezen",
+        "previousAssignee": "Eerder toegewezen teamlid"
+      },
+      "validation": {
+        "client": "Selecteer een klant.",
+        "title": "Voer een titel van 3 tot 200 tekens in.",
+        "description": "Voer een beschrijving van 10 tot 5.000 tekens in.",
+        "category": "Gebruik maximaal 100 tekens.",
+        "notes": "Gebruik maximaal 5.000 tekens."
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt-customer-portal/service-requests",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "license": "MIT",
   "homepage": "https://nuxt-customer-portal.com",
   "repository": {
@@ -41,8 +41,8 @@
     "nanoid": "^5.1.6",
     "pg": "^8.22.0",
     "zod": "^4.4.3",
-    "@nuxt-customer-portal/core": "^0.3.0",
-    "@nuxt-customer-portal/clients": "^0.3.0"
+    "@nuxt-customer-portal/core": "^0.3.2",
+    "@nuxt-customer-portal/clients": "^0.3.2"
   },
   "peerDependencies": {
     "nuxt": "^4.5.1"

package/portal.manifest.mjs

@@ -1,6 +1,6 @@
 export default {
   id: 'service-requests',
-  version: '0.3.0',
+  version: '0.3.2',
   source: '@nuxt-customer-portal/service-requests',
   clientModuleId: 'service-requests',
   dependsOn: ['core', 'clients'],

package/server/api/service-requests/admin/[id].patch.ts

@@ -1,5 +1,6 @@
 import {
   findServiceRequest,
+  listServiceRequestAssignees,
   toServiceRequestDto,
   updateServiceRequest
 } from '@nuxt-customer-portal/service-requests/server/utils/service-request-repository'
@@ -31,8 +32,15 @@ export default defineEventHandler(async (event) => {
   }
 
   const data = adminUpdateServiceRequestSchema.parse(await readBody(event))
+  if (data.assignedToId && data.assignedToId !== existing.assignedToId) {
+    const assignees = await listServiceRequestAssignees(scope.providerOrganizationId)
+    if (!assignees.some((user) => user.id === data.assignedToId)) {
+      throw createError({ statusCode: 400, message: 'Assignee must belong to the provider organization' })
+    }
+  }
   const row = await updateServiceRequest(id, {
     ...data,
+    ...(data.assignedToId !== undefined ? { assignedToId: data.assignedToId || null } : {}),
     resolvedAt: data.status === 'RESOLVED' ? new Date() : existing.resolvedAt,
     closedAt: data.status === 'CLOSED' ? new Date() : existing.closedAt
   })

package/server/api/service-requests/admin/assignees.get.ts

@@ -0,0 +1,7 @@
+import { requireServiceRequestScope } from '@nuxt-customer-portal/service-requests/server/utils/service-request-scope'
+import { listServiceRequestAssignees } from '@nuxt-customer-portal/service-requests/server/utils/service-request-repository'
+
+export default defineEventHandler(async (event) => {
+  const scope = await requireServiceRequestScope(event, 'manage')
+  return listServiceRequestAssignees(scope.providerOrganizationId)
+})

package/server/utils/service-request-repository.ts

@@ -5,7 +5,7 @@ import {
   type NewServiceRequestRecord,
   type ServiceRequestRecord
 } from '@nuxt-customer-portal/service-requests/server/db/schema/service-requests'
-import { organization } from '@nuxt-customer-portal/core/schema'
+import { organization, member, user } from '@nuxt-customer-portal/core/schema'
 import { alias } from 'drizzle-orm/pg-core'
 import type {
   ServiceRequestDashboardDto,
@@ -97,7 +97,7 @@ export const listServiceRequests = async (
         ? priorityRank
         : serviceRequest.createdAt
 
-  const [rows, total] = await Promise.all([
+  const [rows, total, categories] = await Promise.all([
     db
       .select({ request: serviceRequest, clientName: clientOrganization.name })
       .from(serviceRequest)
@@ -106,11 +106,25 @@ export const listServiceRequests = async (
       .orderBy(filters.sortDir === 'asc' ? asc(orderExpression) : desc(orderExpression), asc(serviceRequest.id))
       .offset(filters.offset)
       .limit(filters.pageSize),
-    db.$count(serviceRequest, where)
+    db.$count(serviceRequest, where),
+    db
+      .selectDistinct({ category: serviceRequest.category })
+      .from(serviceRequest)
+      .where(
+        and(
+          ...filterConditions(
+            organizationId,
+            { page: 1, pageSize: 20, offset: 0, sortBy: 'createdAt', sortDir: 'desc' },
+            scope
+          )
+        )
+      )
+      .orderBy(asc(serviceRequest.category))
   ])
 
   return {
     items: rows.map((row) => toServiceRequestDto(row.request, row.clientName)),
+    categories: categories.flatMap((row) => (row.category ? [row.category] : [])),
     pagination: {
       total,
       page: filters.page,
@@ -183,3 +197,11 @@ export const updateServiceRequest = async (id: string, values: Partial<NewServic
 }
 
 export const deleteServiceRequest = (id: string) => db.delete(serviceRequest).where(eq(serviceRequest.id, id))
+
+export const listServiceRequestAssignees = (organizationId: string) =>
+  db
+    .select({ id: user.id, name: user.name, image: user.image })
+    .from(member)
+    .innerJoin(user, eq(user.id, member.userId))
+    .where(eq(member.organizationId, organizationId))
+    .orderBy(asc(user.name), asc(user.id))

package/server/utils/service-request-validation.ts

@@ -2,18 +2,18 @@ import { z } from 'zod'
 
 export const createServiceRequestSchema = z.object({
   clientOrganizationId: z.string().min(1).max(128).optional(),
-  title: z.string().min(3).max(200),
-  description: z.string().min(10).max(5000),
+  title: z.string().trim().min(3).max(200),
+  description: z.string().trim().min(10).max(5000),
   priority: z.enum(['LOW', 'MEDIUM', 'HIGH', 'URGENT']).optional(),
-  category: z.string().max(100).optional()
+  category: z.string().trim().max(100).optional()
 })
 
 export const updateServiceRequestSchema = z.object({
-  title: z.string().min(3).max(200).optional(),
-  description: z.string().min(10).max(5000).optional(),
+  title: z.string().trim().min(3).max(200).optional(),
+  description: z.string().trim().min(10).max(5000).optional(),
   status: z.enum(['OPEN', 'IN_PROGRESS', 'RESOLVED', 'CLOSED']).optional(),
   priority: z.enum(['LOW', 'MEDIUM', 'HIGH', 'URGENT']).optional(),
-  category: z.string().max(100).optional()
+  category: z.string().trim().max(100).optional()
 })
 
 export const adminUpdateServiceRequestSchema = updateServiceRequestSchema.extend({

package/shared/feature.ts

@@ -12,16 +12,7 @@ export const serviceRequestFeature: PortalFeatureDefinition<ServiceRequestAction
       icon: 'i-lucide-ticket',
       to: '/requests',
       audiences: ['authenticated'],
-      order: 20
-    },
-    {
-      id: 'service-requests-admin',
-      labelKey: 'features.serviceRequests.navigation.manageRequests',
-      icon: 'i-lucide-list-checks',
-      to: '/admin/requests',
-      audiences: ['providerAdmin'],
-      location: 'admin',
-      order: 120
+      order: 40
     }
   ],
   modules: [
@@ -32,7 +23,7 @@ export const serviceRequestFeature: PortalFeatureDefinition<ServiceRequestAction
       to: '/requests',
       routePrefixes: ['/requests', '/admin/requests'],
       audiences: ['authenticated'],
-      order: 20,
+      order: 40,
       menuItems: [
         {
           id: 'requests',
@@ -40,20 +31,6 @@ export const serviceRequestFeature: PortalFeatureDefinition<ServiceRequestAction
           icon: 'i-lucide-inbox',
           to: '/requests',
           audiences: ['authenticated']
-        },
-        {
-          id: 'new-request',
-          labelKey: 'features.serviceRequests.navigation.newRequest',
-          icon: 'i-lucide-plus',
-          to: '/requests/new',
-          audiences: ['authenticated']
-        },
-        {
-          id: 'manage-requests',
-          labelKey: 'features.serviceRequests.navigation.manageRequests',
-          icon: 'i-lucide-list-checks',
-          to: '/admin/requests',
-          audiences: ['providerAdmin']
         }
       ]
     }
@@ -64,14 +41,14 @@ export const serviceRequestFeature: PortalFeatureDefinition<ServiceRequestAction
       component: 'ServiceRequestsDashboardAttention',
       area: 'attention',
       size: 'half',
-      order: 30
+      order: 60
     },
     {
       id: 'service-requests-overview',
       component: 'ServiceRequestsDashboardOverview',
       area: 'aside',
       size: 'full',
-      order: 10
+      order: 50
     }
   ],
   clientIntegration: { moduleId: 'service-requests', labelKey: 'features.serviceRequests.navigation.myRequests' },

package/shared/types/service-request.ts

@@ -56,6 +56,7 @@ export interface ServiceRequestPagination {
 export interface ServiceRequestListResponse {
   items: ServiceRequestDto[]
   pagination: ServiceRequestPagination
+  categories?: string[]
 }
 
 export interface ServiceRequestDashboardDto {