fix: don't show reservations tab if application has none

City-of-Helsinki · Dec 18, 2024 · 15406ce · 15406ce
1 parent 56e443e
commit 15406ce
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts
@@ -551,6 +551,7 @@ export type ApplicationSectionNode = Node & {
   application: ApplicationNode;
   appliedReservationsPerWeek: Scalars["Int"]["output"];
   extUuid: Scalars["UUID"]["output"];
+  hasReservations: Scalars["Boolean"]["output"];
   /** The ID of the object */
   id: Scalars["ID"]["output"];
   name: Scalars["String"]["output"];
@@ -5364,6 +5365,7 @@ export type ApplicationSectionCommonFragment = {
 };
 
 export type ApplicationSectionUiFragment = {
+  hasReservations: boolean;
   id: string;
   pk?: number | null;
   name: string;
@@ -5706,6 +5708,7 @@ export type ApplicationAdminFragment = {
   applicationSections?: Array<{
     id: string;
     allocations?: number | null;
+    hasReservations: boolean;
     pk?: number | null;
     name: string;
     status?: ApplicationSectionStatusChoice | null;
@@ -7219,6 +7222,7 @@ export type ApplicationAdminQuery = {
     applicationSections?: Array<{
       id: string;
       allocations?: number | null;
+      hasReservations: boolean;
       pk?: number | null;
       name: string;
       status?: ApplicationSectionStatusChoice | null;
@@ -8743,6 +8747,7 @@ export const ApplicantFragmentDoc = gql`
 export const ApplicationSectionUiFragmentDoc = gql`
   fragment ApplicationSectionUI on ApplicationSectionNode {
     ...ApplicationSectionCommon
+    hasReservations
     suitableTimeRanges {
       id
       pk

diff --git a/apps/ui/gql/gql-types.ts b/apps/ui/gql/gql-types.ts
@@ -551,6 +551,7 @@ export type ApplicationSectionNode = Node & {
   application: ApplicationNode;
   appliedReservationsPerWeek: Scalars["Int"]["output"];
   extUuid: Scalars["UUID"]["output"];
+  hasReservations: Scalars["Boolean"]["output"];
   /** The ID of the object */
   id: Scalars["ID"]["output"];
   name: Scalars["String"]["output"];
@@ -5687,6 +5688,7 @@ export type ApplicationCommonFragment = {
     }>;
   };
   applicationSections?: Array<{
+    hasReservations: boolean;
     id: string;
     pk?: number | null;
     name: string;
@@ -5851,6 +5853,7 @@ export type ApplicationQuery = {
       }>;
     };
     applicationSections?: Array<{
+      hasReservations: boolean;
       id: string;
       pk?: number | null;
       name: string;
@@ -7502,6 +7505,7 @@ export type ApplicationSectionCommonFragment = {
 };
 
 export type ApplicationSectionUiFragment = {
+  hasReservations: boolean;
   id: string;
   pk?: number | null;
   name: string;
@@ -7944,6 +7948,7 @@ export type ApplicationViewQuery = {
       }>;
     };
     applicationSections?: Array<{
+      hasReservations: boolean;
       id: string;
       pk?: number | null;
       name: string;
@@ -8417,6 +8422,7 @@ export const ApplicationSectionCommonFragmentDoc = gql`
 export const ApplicationSectionUiFragmentDoc = gql`
   fragment ApplicationSectionUI on ApplicationSectionNode {
     ...ApplicationSectionCommon
+    hasReservations
     suitableTimeRanges {
       id
       pk

diff --git a/apps/ui/pages/applications/[id]/view/index.tsx b/apps/ui/pages/applications/[id]/view/index.tsx
@@ -106,7 +106,8 @@ function View({ application, tos }: PropsNarrowed): JSX.Element {
   const { sentDate } = application.applicationRound;
   const handledDate = sentDate ? new Date(sentDate) : new Date();
   const showReservations =
-    application.status === ApplicationStatusChoice.ResultsSent;
+    application.status === ApplicationStatusChoice.ResultsSent &&
+    application.applicationSections?.some((section) => section.hasReservations);
 
   return (
     <>

diff --git a/packages/common/gql/gql-types.ts b/packages/common/gql/gql-types.ts
@@ -551,6 +551,7 @@ export type ApplicationSectionNode = Node & {
   application: ApplicationNode;
   appliedReservationsPerWeek: Scalars["Int"]["output"];
   extUuid: Scalars["UUID"]["output"];
+  hasReservations: Scalars["Boolean"]["output"];
   /** The ID of the object */
   id: Scalars["ID"]["output"];
   name: Scalars["String"]["output"];
@@ -5364,6 +5365,7 @@ export type ApplicationSectionCommonFragment = {
 };
 
 export type ApplicationSectionUiFragment = {
+  hasReservations: boolean;
   id: string;
   pk?: number | null;
   name: string;
@@ -5643,6 +5645,7 @@ export const ApplicationSectionCommonFragmentDoc = gql`
 export const ApplicationSectionUiFragmentDoc = gql`
   fragment ApplicationSectionUI on ApplicationSectionNode {
     ...ApplicationSectionCommon
+    hasReservations
     suitableTimeRanges {
       id
       pk

diff --git a/packages/common/src/queries/application.tsx b/packages/common/src/queries/application.tsx
@@ -53,6 +53,7 @@ export const APPLICATION_SECTION_UI_FRAGMENT = gql`
   ${APPLICATION_SECTION_COMMON_FRAGMENT}
   fragment ApplicationSectionUI on ApplicationSectionNode {
     ...ApplicationSectionCommon
+    hasReservations
     suitableTimeRanges {
       id
       pk

diff --git a/tilavaraus.graphql b/tilavaraus.graphql
@@ -582,6 +582,7 @@ type ApplicationSectionNode implements Node {
   application: ApplicationNode!
   appliedReservationsPerWeek: Int!
   extUuid: UUID!
+  hasReservations: Boolean!
   """
   The ID of the object
   """