diff --git a/apps/web/components/OfficialJournalOfIceland/OJOIHomeIntro.tsx b/apps/web/components/OfficialJournalOfIceland/OJOIHomeIntro.tsx index 2a1ac7bdffb4..a6bb2a419949 100644 --- a/apps/web/components/OfficialJournalOfIceland/OJOIHomeIntro.tsx +++ b/apps/web/components/OfficialJournalOfIceland/OJOIHomeIntro.tsx @@ -1,5 +1,3 @@ -import { ReactNode } from 'react' - import { Box, GridColumn, @@ -17,7 +15,7 @@ import * as s from './OJOIHomeIntro.css' export type OJOIHomeIntroProps = { organization?: Organization - breadCrumbs: ReactNode + breadCrumbs: React.ReactNode searchPlaceholder: string quickLinks: Array<{ title: string; href: string; variant?: TagVariant }> searchUrl: string diff --git a/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx b/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx index 8c850f198515..2f4e0d1dd2db 100644 --- a/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx +++ b/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx @@ -1,11 +1,10 @@ -import format from 'date-fns/format' -import is from 'date-fns/locale/is' - import { LinkV2, Table as T, Text } from '@island.is/island-ui/core' import { Locale } from '@island.is/shared/types' import { OfficialJournalOfIcelandAdvertsResponse } from '@island.is/web/graphql/schema' import { useLinkResolver } from '@island.is/web/hooks' +import { formatDate } from './OJOIUtils' + export const OJOISearchListView = ({ adverts, locale, @@ -31,9 +30,7 @@ export const OJOISearchListView = ({ - {format(new Date(ad.publicationDate), 'dd.MM.yyyy', { - locale: is, - })} + {formatDate(ad.publicationDate)} diff --git a/apps/web/components/OfficialJournalOfIceland/OJOIWrapper.tsx b/apps/web/components/OfficialJournalOfIceland/OJOIWrapper.tsx index 3c4a0918b500..274f25b1a5fb 100644 --- a/apps/web/components/OfficialJournalOfIceland/OJOIWrapper.tsx +++ b/apps/web/components/OfficialJournalOfIceland/OJOIWrapper.tsx @@ -7,6 +7,9 @@ import { BreadCrumbItem, Breadcrumbs, Button, + GridColumn, + GridContainer, + GridRow, LinkV2, Text, } from '@island.is/island-ui/core' @@ -28,6 +31,7 @@ type WrapperProps = { sidebarContent?: ReactNode goBackUrl?: string hideTitle?: boolean + isHomePage?: boolean } export const OJOIWrapper = ({ @@ -40,6 +44,7 @@ export const OJOIWrapper = ({ sidebarContent, goBackUrl, hideTitle, + isHomePage, }: WrapperProps) => { const { width } = useWindowSize() const [isMobile, setIsMobile] = useState() @@ -133,7 +138,46 @@ export const OJOIWrapper = ({ )} - {!sidebarContent && children} + {!sidebarContent && !isHomePage && ( + + + + {breadcrumbItems && ( + { + return item?.href ? ( + + {link} + + ) : ( + link + ) + }} + /> + )} + + {!hideTitle && ( + + {pageTitle} + + )} + + {pageDescription && ( + + {pageDescription} + + )} + + + {children} + + + + + )} + + {!sidebarContent && isHomePage && children} = ({ + cases, + organization, + locale, +}) => { + const { formatMessage } = useIntl() + const { linkResolver } = useLinkResolver() + + const baseUrl = linkResolver('ojoihome', [], locale).href + + const breadcrumbItems = [ + { + title: 'Ísland.is', + href: linkResolver('homepage', [], locale).href, + }, + { + title: organization?.title ?? '', + href: baseUrl, + }, + { + title: 'Mál í vinnslu', + }, + ] + + return ( + + {!cases || cases.length === 0 ? ( +

{formatMessage(m.casesInProgress.notFoundMessage)}

+ ) : ( + + + + + {formatMessage(m.casesInProgress.createdAt)} + + + {formatMessage(m.casesInProgress.requestedPublicationDate)} + + + {formatMessage(m.casesInProgress.advertTitle)} + + + {formatMessage(m.casesInProgress.involvedParty)} + + + + + {cases.map((c) => ( + + {formatDate(c.createdAt)} + {formatDate(c.requestedPublicationDate)} + {c.advertType.title + ' ' + c.advertTitle} + {c.involvedParty.title} + + ))} + + + )} + + ) +} + +interface OJOICasesInProgressProps { + cases?: Array + organization?: Query['getOrganization'] + locale: Locale +} + +const OJOICasesInProgress: CustomScreen = ({ + cases, + organization, + customPageData, + locale, +}) => { + return ( + + ) +} + +OJOICasesInProgress.getProps = async ({ apolloClient, locale }) => { + const organizationSlug = 'stjornartidindi' + + const [ + { + data: { officialJournalOfIcelandCasesInProgress }, + }, + { + data: { getOrganization }, + }, + ] = await Promise.all([ + apolloClient.query( + { + query: CASES_IN_PROGRESS_QUERY, + variables: { + params: {}, + }, + }, + ), + apolloClient.query({ + query: GET_ORGANIZATION_QUERY, + variables: { + input: { + slug: organizationSlug, + lang: locale as ContentLanguage, + }, + }, + }), + ]) + + if (!getOrganization?.hasALandingPage) { + throw new CustomNextError(404, 'Organization page not found') + } + + return { + cases: officialJournalOfIcelandCasesInProgress?.cases, + organization: getOrganization, + locale: locale as Locale, + showSearchInHeader: false, + themeConfig: { + footerVersion: 'organization', + }, + } +} + +export default withMainLayout( + withCustomPageWrapper( + CustomPageUniqueIdentifier.OfficialJournalOfIceland, + OJOICasesInProgress, + ), +) diff --git a/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx b/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx index 6af57b49482b..7fb2e987a60c 100644 --- a/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx +++ b/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx @@ -93,6 +93,7 @@ const OJOIHomePage: CustomScreen = ({ pageDescription={formatMessage(m.home.description)} organization={organization ?? undefined} pageFeaturedImage={formatMessage(m.home.featuredImage)} + isHomePage > Date, { nullable: true }) - dateFrom?: Date + dateFrom?: string @Field(() => Date, { nullable: true }) - dateTo?: Date + dateTo?: string } @InputType('OfficialJournalOfIcelandTypesInput') diff --git a/libs/api/domains/official-journal-of-iceland/src/lib/models/case.model.ts b/libs/api/domains/official-journal-of-iceland/src/lib/models/case.model.ts new file mode 100644 index 000000000000..9f520a8822ae --- /dev/null +++ b/libs/api/domains/official-journal-of-iceland/src/lib/models/case.model.ts @@ -0,0 +1,23 @@ +import { Field, ID, ObjectType } from '@nestjs/graphql' +import { AdvertEntity } from './advert.model' + +@ObjectType('OfficialJournalOfIcelandCase') +export class Case { + @Field(() => ID) + id!: string + + @Field(() => AdvertEntity) + advertType!: AdvertEntity | null + + @Field(() => String) + advertTitle!: string | null + + @Field(() => AdvertEntity) + involvedParty!: AdvertEntity | null + + @Field(() => String) + createdAt!: string | null + + @Field(() => String) + requestedPublicationDate!: string | null +} diff --git a/libs/api/domains/official-journal-of-iceland/src/lib/models/cases.response.ts b/libs/api/domains/official-journal-of-iceland/src/lib/models/cases.response.ts new file mode 100644 index 000000000000..0681a825cd15 --- /dev/null +++ b/libs/api/domains/official-journal-of-iceland/src/lib/models/cases.response.ts @@ -0,0 +1,13 @@ +import { Field, ObjectType } from '@nestjs/graphql' + +import { AdvertPaging } from './advert-paging.model' +import { Case } from './case.model' + +@ObjectType('OfficialJournalOfIcelandCasesInProgressResponse') +export class CasesInProgressResponse { + @Field(() => [Case]) + cases!: Case[] + + @Field(() => AdvertPaging) + paging!: AdvertPaging +} diff --git a/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.resolver.ts b/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.resolver.ts index e96092c25c66..cde591d90f87 100644 --- a/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.resolver.ts +++ b/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.resolver.ts @@ -22,6 +22,7 @@ import { } from './models/advert.response' import { Features } from '@island.is/feature-flags' import { FeatureFlag } from '@island.is/nest/feature-flags' +import { CasesInProgressResponse } from './models/cases.response' @Scopes(ApiScope.internal) @FeatureFlag(Features.officialJournalOfIceland) @@ -91,4 +92,11 @@ export class OfficialJournalOfIcelandResolver { getInstitutions(@Args('params') params: QueryParams) { return this.ojoiService.getInstitutions(params) } + + @Query(() => CasesInProgressResponse, { + name: 'officialJournalOfIcelandCasesInProgress', + }) + getCasesInProgress(@Args('params') params: QueryParams) { + return this.ojoiService.getCasesInProgress(params) + } } diff --git a/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.service.ts b/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.service.ts index bf825bdc72eb..954a7ab1d8ad 100644 --- a/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.service.ts +++ b/libs/api/domains/official-journal-of-iceland/src/lib/officialJournalOfIceland.service.ts @@ -1,5 +1,6 @@ import { GetAdvertsRequest, + GetCasesInProgressRequest, OfficialJournalOfIcelandClientService, } from '@island.is/clients/official-journal-of-iceland' import { Injectable } from '@nestjs/common' @@ -17,6 +18,7 @@ import { AdvertsResponse, AdvertTypesResponse, } from './models/advert.response' +import { CasesInProgressResponse } from './models/cases.response' @Injectable() export class OfficialJournalOfIcelandService { @@ -65,4 +67,10 @@ export class OfficialJournalOfIcelandService { async getAdverts(input: GetAdvertsRequest): Promise { return await this.ojoiService.getAdverts(input) } + + async getCasesInProgress( + input: GetCasesInProgressRequest, + ): Promise { + return await this.ojoiService.getCasesInProgress(input) + } } diff --git a/libs/clients/official-journal-of-iceland/public/src/clientConfig.json b/libs/clients/official-journal-of-iceland/public/src/clientConfig.json index d69a08b031b3..be9600325d7b 100644 --- a/libs/clients/official-journal-of-iceland/public/src/clientConfig.json +++ b/libs/clients/official-journal-of-iceland/public/src/clientConfig.json @@ -82,14 +82,14 @@ "description": "Date from which to filter adverts on, inclusive, takes into account `createdDate`, `updatedDate` and `signatureDate`.", "required": false, "in": "query", - "schema": { "format": "date-time", "type": "string" } + "schema": { "type": "string" } }, { "name": "dateTo", "description": "Date to which to filter adverts on, inclusive, takes into account `createdDate`, `updatedDate` and `signatureDate`.", "required": false, "in": "query", - "schema": { "format": "date-time", "type": "string" } + "schema": { "type": "string" } } ], "responses": { @@ -410,6 +410,44 @@ } } }, + "/api/v1/cases": { + "get": { + "operationId": "getCasesInProgress", + "parameters": [ + { + "name": "search", + "description": "String to search for", + "required": false, + "in": "query", + "schema": { "type": "string" } + }, + { + "name": "page", + "description": "Page number to return.", + "required": false, + "in": "query", + "schema": { "type": "number" } + }, + { + "name": "pageSize", + "description": "Page size number to return.", + "required": false, + "in": "query", + "schema": { "type": "number" } + } + ], + "responses": { + "default": { + "description": "", + "content": { + "application/json": { + "schema": { "$ref": "#/components/schemas/GetCasesReponse" } + } + } + } + } + } + }, "/api/v1/error": { "get": { "operationId": "error", @@ -1017,6 +1055,545 @@ }, "required": ["items", "paging"] }, + "CaseStatus": { + "type": "object", + "properties": { + "id": { + "type": "string", + "example": "d290f1ee-6c54-4b01-90e6-d701748f0851" + }, + "title": { + "type": "string", + "enum": [ + "Innsent", + "Grunnvinnsla", + "Yfirlestur", + "Tilbúið", + "Útgefið", + "Tekið úr birtingu", + "Birtingu hafnað" + ], + "example": "Innsent", + "description": "Status of the case" + }, + "slug": { + "type": "string", + "example": "innsent", + "description": "Slug of the case staus" + } + }, + "required": ["id", "title", "slug"] + }, + "CaseTag": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Unique ID for the case tag", + "example": "00000000-0000-0000-0000-000000000000", + "nullable": false + }, + "title": { + "type": "string", + "enum": ["Ekki hafið", "Í yfirlestri", "Samlesin", "Þarf skoðun"], + "description": "Title of the case tag", + "example": "Í yfirlestri" + }, + "slug": { + "type": "string", + "description": "Slug of the case tag", + "example": "i-yfirlestri" + } + }, + "required": ["id", "title", "slug"] + }, + "User": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Unique ID for the user, GUID format.", + "example": "00000000-0000-0000-0000-000000000000", + "nullable": false + }, + "name": { + "type": "string", + "description": "First name of the user.", + "example": "Jón Gunnar" + }, + "lastName": { + "type": "string", + "description": "Last name of the user.", + "example": "Jónsson" + }, + "active": { + "type": "boolean", + "description": "Status of the user", + "example": true + } + }, + "required": ["id", "name", "lastName", "active"] + }, + "CommunicationStatus": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The id of the communication status" + }, + "title": { + "type": "string", + "enum": [ + "Ekki hafin", + "Beðið eftir svörum", + "Svör hafa borist", + "Lokið" + ], + "description": "The title of the communication status" + }, + "slug": { + "type": "string", + "description": "The slug of the communication status" + } + }, + "required": ["id", "title", "slug"] + }, + "CaseChannel": { + "type": "object", + "properties": { + "id": { + "type": "string", + "example": "d290f1ee-6c54-4b01-90e6-d701748f0851", + "description": "Id of the case channel." + }, + "email": { + "type": "string", + "example": "hjalp@dmr.is", + "description": "Email of the case channel." + }, + "phone": { + "type": "string", + "example": "+354 123 4567", + "description": "Phone of the case channel." + } + }, + "required": ["id", "email", "phone"] + }, + "CaseCommentType": { + "type": "string", + "description": "Title of the comment", + "enum": [ + "Innsent af:", + "færir mál á", + "merkir sér málið.", + "færir mál í stöðuna:", + "gerir athugasemd.", + "skráir skilaboð" + ] + }, + "CaseCommentDirection": { + "type": "string", + "description": "Was the comment sent or received.", + "enum": ["sent", "received"] + }, + "CaseComment": { + "type": "object", + "properties": { + "id": { + "type": "string", + "example": "d290f1ee-6c54-4b01-90e6-d701748f0851", + "description": "Id of the case comment." + }, + "title": { + "example": "f. 2 dögum", + "$ref": "#/components/schemas/CaseCommentType" + }, + "caseStatus": { + "type": "string", + "enum": [ + "Innsent", + "Grunnvinnsla", + "Yfirlestur", + "Tilbúið", + "Útgefið", + "Tekið úr birtingu", + "Birtingu hafnað" + ], + "description": "Case status of when the comment was created." + }, + "age": { + "type": "string", + "example": "f. 2 dögum", + "description": "String representation of the age of the case comment." + }, + "ageIso": { + "type": "string", + "description": "ISO date format representation of the age of the case comment." + }, + "direction": { "$ref": "#/components/schemas/CaseCommentDirection" }, + "creator": { + "type": "string", + "description": "Who created the comment " + }, + "receiver": { + "type": "string", + "description": "Who received the comment" + }, + "comment": { "type": "string", "description": "The comment itself" } + }, + "required": [ + "id", + "title", + "caseStatus", + "age", + "ageIso", + "direction", + "creator", + "receiver", + "comment" + ] + }, + "SignatureType": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The id of the signature type" + }, + "title": { + "type": "string", + "description": "The title of the signature type" + }, + "slug": { + "type": "string", + "description": "The slug of the signature type" + } + }, + "required": ["id", "title", "slug"] + }, + "SignatureMember": { + "type": "object", + "properties": { + "text": { + "type": "string", + "description": "The name/title/w.e. of the signature member" + }, + "textAbove": { + "type": "string", + "description": "The text comes above the signature name" + }, + "textBefore": { + "type": "string", + "description": "The text that comes before the signature name" + }, + "textBelow": { + "type": "string", + "description": "The text that comes below the signature name" + }, + "textAfter": { + "type": "string", + "description": "The text that comes after the signature name" + } + }, + "required": ["text"] + }, + "Signature": { + "type": "object", + "properties": { + "id": { "type": "string", "description": "The id of the signature" }, + "institution": { + "type": "string", + "description": "Institution of the signature" + }, + "date": { + "type": "string", + "description": "ISO datestring of the signature" + }, + "type": { + "description": "The type of the signature", + "allOf": [{ "$ref": "#/components/schemas/SignatureType" }] + }, + "involvedParty": { + "description": "The involved party of the signature", + "allOf": [{ "$ref": "#/components/schemas/Institution" }] + }, + "members": { + "description": "Members of the signature", + "type": "array", + "items": { "$ref": "#/components/schemas/SignatureMember" } + }, + "chairman": { + "description": "Chairman of the signature", + "allOf": [{ "$ref": "#/components/schemas/SignatureMember" }] + }, + "additionalSignature": { + "type": "string", + "description": "Additional signature name" + }, + "html": { "type": "string", "description": "HTML of the signature" } + }, + "required": [ + "id", + "institution", + "date", + "type", + "involvedParty", + "members" + ] + }, + "ApplicationAttachmentType": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Id of the attachment type" + }, + "title": { + "type": "string", + "enum": ["Frumrit", "Fylgiskjöl"], + "description": "Title of the attachment type" + }, + "slug": { + "type": "string", + "description": "Slug of the attachment type" + } + }, + "required": ["id", "title", "slug"] + }, + "ApplicationAttachment": { + "type": "object", + "properties": { + "id": { "type": "string", "description": "Id of the attachment" }, + "applicationId": { + "type": "string", + "description": "Id of the application" + }, + "originalFileName": { + "type": "string", + "description": "Original file name" + }, + "fileName": { "type": "string", "description": "File name" }, + "fileFormat": { "type": "string", "description": "File format" }, + "fileExtension": { + "type": "string", + "description": "File extension" + }, + "fileSize": { "type": "number", "description": "File size" }, + "fileLocation": { "type": "string", "description": "File location" }, + "type": { + "description": "Attachment type", + "allOf": [ + { "$ref": "#/components/schemas/ApplicationAttachmentType" } + ] + }, + "deleted": { "type": "boolean", "description": "Deleted" } + }, + "required": [ + "id", + "applicationId", + "originalFileName", + "fileName", + "fileFormat", + "fileExtension", + "fileSize", + "fileLocation", + "type", + "deleted" + ] + }, + "Case": { + "type": "object", + "properties": { + "id": { + "type": "string", + "example": "d290f1ee-6c54-4b01-90e6-d701748f0851" + }, + "applicationId": { + "type": "string", + "example": "d290f1ee-6c54-4b01-90e6-d701748f0851", + "description": "Id of the submitted application, default to null on older cases." + }, + "year": { + "type": "number", + "example": 2024, + "description": "Year the case was created." + }, + "caseNumber": { + "type": "string", + "example": 190, + "description": "Case number (numeric string) gets generated automatically when a case is created." + }, + "status": { + "description": "Status of the case, default to \"Innsent\"", + "allOf": [{ "$ref": "#/components/schemas/CaseStatus" }] + }, + "tag": { + "description": "Internal tag for the case, default to null", + "allOf": [{ "$ref": "#/components/schemas/CaseTag" }] + }, + "involvedParty": { + "description": "Involved party of the case.", + "allOf": [{ "$ref": "#/components/schemas/Institution" }] + }, + "createdAt": { + "type": "string", + "example": "2024-01-01T09:00:00Z", + "description": "Date the case was created. ISO 8601 date and time format in UTC." + }, + "modifiedAt": { + "type": "string", + "example": "2024-01-01T09:00:00Z", + "description": "Date when the case was last updated. ISO 8601 date and time format in UTC." + }, + "isLegacy": { + "type": "boolean", + "example": false, + "description": "Is legacy case." + }, + "assignedTo": { + "description": "User the case is assigned to.", + "nullable": true, + "allOf": [{ "$ref": "#/components/schemas/User" }] + }, + "communicationStatus": { + "description": "Status of communication with the applicant, default to `CaseCommunicationStatus.NotStarted`", + "allOf": [{ "$ref": "#/components/schemas/CommunicationStatus" }] + }, + "fastTrack": { + "type": "boolean", + "example": false, + "description": "Requested fast track" + }, + "publishedAt": { + "type": "string", + "example": "2024-01-01T09:00:00Z", + "description": "Date the case was published. ISO 8601 date and time format in UTC." + }, + "requestedPublicationDate": { + "type": "string", + "example": "2024-01-01T09:00:00Z", + "description": "Requested advert publication date. ISO 8601 date and time format in UTC." + }, + "advertTitle": { + "type": "string", + "example": "Titill á máli", + "description": "Advert title on case" + }, + "advertDepartment": { + "example": "B-Deild", + "description": "Advert department", + "allOf": [{ "$ref": "#/components/schemas/Department" }] + }, + "advertType": { + "description": "The advert type", + "allOf": [{ "$ref": "#/components/schemas/AdvertType" }] + }, + "advertCategories": { + "description": "List of advert categories.", + "nullable": false, + "type": "array", + "items": { "$ref": "#/components/schemas/Category" } + }, + "price": { + "type": "number", + "example": 23000, + "description": "The cost of the case." + }, + "paid": { + "type": "boolean", + "example": false, + "description": "Is the case paid for." + }, + "message": { + "type": "string", + "nullable": true, + "example": "Additional message from sender" + }, + "html": { "type": "string", "description": "The case html content." }, + "publicationNumber": { + "type": "string", + "description": "Publication number of the case." + }, + "channels": { + "description": "Channels for the case.", + "example": { + "id": "d290f1ee-6c54-4b01-90e6-d701748f0851", + "email": "dmr@dmr.is", + "phone": "+354 123 4567" + }, + "type": "array", + "items": { "$ref": "#/components/schemas/CaseChannel" } + }, + "comments": { + "description": "Comments on the case.", + "example": { + "id": "d290f1ee-6c54-4b01-90e6-d701748f0851", + "createdAt": "2024-01-01T09:00:00Z", + "type": "Comment", + "task": { + "from": "Ármann", + "to": null, + "title": "gerir athugasemd", + "comment": "Pálína, getur þú tekið við og staðfest að upplýsingarnar séu réttar?" + } + }, + "type": "array", + "items": { "$ref": "#/components/schemas/CaseComment" } + }, + "signatures": { + "type": "array", + "items": { "$ref": "#/components/schemas/Signature" } + }, + "attachments": { + "type": "array", + "items": { "$ref": "#/components/schemas/ApplicationAttachment" } + } + }, + "required": [ + "id", + "applicationId", + "year", + "caseNumber", + "status", + "tag", + "involvedParty", + "createdAt", + "modifiedAt", + "isLegacy", + "assignedTo", + "communicationStatus", + "fastTrack", + "publishedAt", + "requestedPublicationDate", + "advertTitle", + "advertDepartment", + "advertType", + "advertCategories", + "price", + "paid", + "message", + "html", + "publicationNumber", + "channels", + "comments", + "signatures", + "attachments" + ] + }, + "GetCasesReponse": { + "type": "object", + "properties": { + "cases": { + "type": "array", + "items": { "$ref": "#/components/schemas/Case" } + }, + "paging": { + "description": "Paging info", + "allOf": [{ "$ref": "#/components/schemas/Paging" }] + } + }, + "required": ["cases", "paging"] + }, "ValidationResponse": { "type": "object", "properties": { diff --git a/libs/clients/official-journal-of-iceland/public/src/lib/officialJournalOfIcelandClient.service.ts b/libs/clients/official-journal-of-iceland/public/src/lib/officialJournalOfIcelandClient.service.ts index 9e8970036431..1ab4b33951c9 100644 --- a/libs/clients/official-journal-of-iceland/public/src/lib/officialJournalOfIcelandClient.service.ts +++ b/libs/clients/official-journal-of-iceland/public/src/lib/officialJournalOfIcelandClient.service.ts @@ -10,6 +10,7 @@ import { GetAdvertTypesRequest, GetDepartmentByIdRequest, GetAdvertTypeByIdRequest, + GetCasesInProgressRequest, } from '../../gen/fetch/apis' @Injectable() @@ -51,4 +52,8 @@ export class OfficialJournalOfIcelandClientService { public async getInstitutions(params: GetInstitutionsRequest) { return this.api.getInstitutions(params) } + + public async getCasesInProgress(params: GetCasesInProgressRequest) { + return this.api.getCasesInProgress(params) + } }