Merge pull request #1642 from navikt/Tidslinjer

Tidslinjer
navikt · Aug 30, 2023 · e9ffa95 · e9ffa95
2 parents 7645d75 + 6eba77a
commit e9ffa95
Show file tree

Hide file tree

Showing 15 changed files with 651 additions and 236 deletions.
diff --git a/bruker.graphql b/bruker.graphql
@@ -73,6 +73,8 @@ type Sak {
     """
     frister: [ISO8601Date]!
     oppgaver: [OppgaveMetadata!]!
+
+    tidslinje: [TidslinjeElement!]!
 }
 
 type SakStatus {
@@ -81,11 +83,31 @@ type SakStatus {
     tidspunkt: ISO8601DateTime!
 }
 
+union TidslinjeElement =
+    | OppgaveTidslinjeElement
+    | BeskjedTidslinjeElement
+
+type OppgaveTidslinjeElement {
+    id: ID!
+    tekst: String!
+    opprettetTidspunkt: ISO8601DateTime!
+    tilstand: OppgaveTilstand!
+    paaminnelseTidspunkt: ISO8601DateTime
+    utgaattTidspunkt: ISO8601DateTime
+    utfoertTidspunkt: ISO8601DateTime
+    frist: ISO8601Date
+}
+
+type BeskjedTidslinjeElement {
+    id: ID!
+    tekst: String!
+    opprettetTidspunkt: ISO8601DateTime!
+}
+
 enum SakStatusType {
     MOTTATT
     UNDER_BEHANDLING
     FERDIG
-
 }
 
 type SakMetadata {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "homepage": "/min-side-arbeidsgiver",
     "dependencies": {
         "@navikt/aksel-icons": "^4.9.0",
-        "@navikt/arbeidsgiver-notifikasjon-widget": "6.2.3",
+        "@navikt/arbeidsgiver-notifikasjon-widget": "6.3.8",
         "@navikt/bedriftsmeny": "6.10.0",
         "@navikt/ds-css": "^4.9.0",
         "@navikt/ds-icons": "3.4.3",

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "main": "server.js",
   "dependencies": {
-    "@navikt/arbeidsgiver-notifikasjoner-brukerapi-mock": "6.2.3",
+    "@navikt/arbeidsgiver-notifikasjoner-brukerapi-mock": "6.3.8",
     "apollo-server-express": "3.11.1",
     "casual": "^1.6.2",
     "cookie-parser": "^1.4.6",

diff --git a/src/App/Hovedside/Sak/OppgaveBeskjedIkoner.tsx b/src/App/Hovedside/Sak/OppgaveBeskjedIkoner.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+
+export const NyOppgaveIkon = () => (
+    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <rect width="24" height="24" rx="4" fill="#C77300" />
+        <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M6.1875 5.625C6.1875 5.10723 6.60723 4.6875 7.125 4.6875H16.875C17.3928 4.6875 17.8125 5.10723 17.8125 5.625V18.375C17.8125 18.8928 17.3928 19.3125 16.875 19.3125H7.125C6.60723 19.3125 6.1875 18.8928 6.1875 18.375V5.625ZM11.4375 15C11.4375 14.6893 11.6893 14.4375 12 14.4375H14.625C14.9357 14.4375 15.1875 14.6893 15.1875 15C15.1875 15.3107 14.9357 15.5625 14.625 15.5625H12C11.6893 15.5625 11.4375 15.3107 11.4375 15ZM12 11.4375C11.6893 11.4375 11.4375 11.6893 11.4375 12C11.4375 12.3107 11.6893 12.5625 12 12.5625H14.625C14.9357 12.5625 15.1875 12.3107 15.1875 12C15.1875 11.6893 14.9357 11.4375 14.625 11.4375H12ZM9.7575 12.5625H9.75C9.43934 12.5625 9.1875 12.3107 9.1875 12C9.1875 11.6893 9.43934 11.4375 9.75 11.4375H9.7575C10.0682 11.4375 10.32 11.6893 10.32 12C10.32 12.3107 10.0682 12.5625 9.7575 12.5625ZM9.7575 14.4375H9.75C9.43934 14.4375 9.1875 14.6893 9.1875 15C9.1875 15.3107 9.43934 15.5625 9.75 15.5625H9.7575C10.0682 15.5625 10.32 15.3107 10.32 15C10.32 14.6893 10.0682 14.4375 9.7575 14.4375ZM12.1875 8.25C12.1875 7.93934 12.4393 7.6875 12.75 7.6875H14.625C14.9357 7.6875 15.1875 7.93934 15.1875 8.25C15.1875 8.56066 14.9357 8.8125 14.625 8.8125H12.75C12.4393 8.8125 12.1875 8.56066 12.1875 8.25ZM11.325 7.83753C11.5114 7.589 11.461 7.23643 11.2125 7.05003C10.964 6.86364 10.6114 6.914 10.425 7.16253L9.68914 8.14368L9.39775 7.85229C9.17808 7.63262 8.82192 7.63262 8.60225 7.85229C8.38258 8.07196 8.38258 8.42811 8.60225 8.64778L9.35225 9.39778C9.46756 9.51308 9.62722 9.57268 9.78988 9.56112C9.95253 9.54956 10.1022 9.46798 10.2 9.33753L11.325 7.83753Z"
+            fill="white"
+        />
+    </svg>
+);
+
+export const OppgaveUtfortIkon = () => (
+    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <rect width="24" height="24" rx="4" fill="#021431" fillOpacity="0.49" />
+        <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M6.1875 5.625C6.1875 5.10723 6.60723 4.6875 7.125 4.6875H16.875C17.3928 4.6875 17.8125 5.10723 17.8125 5.625V18.375C17.8125 18.8928 17.3928 19.3125 16.875 19.3125H7.125C6.60723 19.3125 6.1875 18.8928 6.1875 18.375V5.625ZM11.4375 15C11.4375 14.6893 11.6893 14.4375 12 14.4375H14.625C14.9357 14.4375 15.1875 14.6893 15.1875 15C15.1875 15.3107 14.9357 15.5625 14.625 15.5625H12C11.6893 15.5625 11.4375 15.3107 11.4375 15ZM12 11.4375C11.6893 11.4375 11.4375 11.6893 11.4375 12C11.4375 12.3107 11.6893 12.5625 12 12.5625H14.625C14.9357 12.5625 15.1875 12.3107 15.1875 12C15.1875 11.6893 14.9357 11.4375 14.625 11.4375H12ZM9.7575 12.5625H9.75C9.43934 12.5625 9.1875 12.3107 9.1875 12C9.1875 11.6893 9.43934 11.4375 9.75 11.4375H9.7575C10.0682 11.4375 10.32 11.6893 10.32 12C10.32 12.3107 10.0682 12.5625 9.7575 12.5625ZM9.7575 14.4375H9.75C9.43934 14.4375 9.1875 14.6893 9.1875 15C9.1875 15.3107 9.43934 15.5625 9.75 15.5625H9.7575C10.0682 15.5625 10.32 15.3107 10.32 15C10.32 14.6893 10.0682 14.4375 9.7575 14.4375ZM12.1875 8.25C12.1875 7.93934 12.4393 7.6875 12.75 7.6875H14.625C14.9357 7.6875 15.1875 7.93934 15.1875 8.25C15.1875 8.56066 14.9357 8.8125 14.625 8.8125H12.75C12.4393 8.8125 12.1875 8.56066 12.1875 8.25ZM11.325 7.83753C11.5114 7.589 11.461 7.23643 11.2125 7.05003C10.964 6.86364 10.6114 6.914 10.425 7.16253L9.68914 8.14368L9.39775 7.85229C9.17808 7.63262 8.82192 7.63262 8.60225 7.85229C8.38258 8.07196 8.38258 8.42811 8.60225 8.64778L9.35225 9.39778C9.46756 9.51308 9.62722 9.57268 9.78988 9.56112C9.95253 9.54956 10.1022 9.46798 10.2 9.33753L11.325 7.83753Z"
+            fill="white"
+        />
+    </svg>
+);
+
+export const BeskjedIkon = () => (
+    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <rect width="24" height="24" rx="4" fill="#3380A5" />
+        <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M5.4375 7.5C5.4375 6.36091 6.36091 5.4375 7.5 5.4375H16.5C17.6391 5.4375 18.5625 6.36091 18.5625 7.5V14.25C18.5625 15.3891 17.6391 16.3125 16.5 16.3125H9.9058L6.2894 18.4823C6.11563 18.5866 5.89921 18.5893 5.72286 18.4895C5.54651 18.3896 5.4375 18.2027 5.4375 18V7.5Z"
+            fill="white"
+        />
+    </svg>
+);
+
+export const TidslinjeLinjeIkon = () => (
+    <svg width="24" height="32" viewBox="0 0 24 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <line x1="11.5" y1="32" x2="11.5" stroke="#979797" />
+    </svg>
+);
+
+export const TidslinjeLinjeIkonKort = () => (
+    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <line x1="11.5" y1="24" x2="11.5" stroke="#979797" />
+    </svg>
+);
diff --git a/src/App/Hovedside/Sak/OppgaveIkon.tsx b/src/App/Hovedside/Sak/OppgaveIkon.tsx