Hybridbrev: Opnar for å redigere (delar av) brev frå Brevbakeren #1840
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package no.nav.etterlatte.brev | ||
|
|
||
| import no.nav.etterlatte.brev.model.Slate | ||
| import no.nav.pensjon.brevbaker.api.model.RenderedJsonLetter | ||
|
|
||
| object BlockTilSlateKonverterer { | ||
| fun konverter(it: RenderedJsonLetter) = Slate( | ||
| it | ||
| .blocks | ||
| .map { block -> tilSlateElement(block) } | ||
| .toList() | ||
| ) | ||
|
|
||
| private fun tilSlateElement(block: RenderedJsonLetter.Block) = when (block.type) { | ||
| RenderedJsonLetter.Block.Type.TITLE1 -> Slate.Element( | ||
| type = Slate.ElementType.HEADING_TWO, | ||
| children = children(block) | ||
| ) | ||
| RenderedJsonLetter.Block.Type.TITLE2 -> Slate.Element( | ||
| type = Slate.ElementType.HEADING_THREE, | ||
| children = children(block) | ||
| ) | ||
|
|
||
| RenderedJsonLetter.Block.Type.PARAGRAPH -> Slate.Element( | ||
| type = Slate.ElementType.PARAGRAPH, | ||
| children = children(block) | ||
| ) | ||
| } | ||
|
|
||
| private fun children(block: RenderedJsonLetter.Block): List<Slate.InnerElement> = when (block.type) { | ||
| RenderedJsonLetter.Block.Type.TITLE1 -> (block as RenderedJsonLetter.Block.Title1).content.map { konverter(it) } | ||
| RenderedJsonLetter.Block.Type.TITLE2 -> (block as RenderedJsonLetter.Block.Title2).content.map { konverter(it) } | ||
| RenderedJsonLetter.Block.Type.PARAGRAPH -> (block as RenderedJsonLetter.Block.Paragraph).content.map { | ||
| konverter( | ||
| it | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun konverter(it: RenderedJsonLetter.ParagraphContent): Slate.InnerElement = when (it.type) { | ||
| RenderedJsonLetter.ParagraphContent.Type.ITEM_LIST -> Slate.InnerElement( | ||
| type = Slate.ElementType.BULLETED_LIST, | ||
| children = | ||
| (it as RenderedJsonLetter.ParagraphContent.ItemList).items | ||
| .map { item -> | ||
| Slate.InnerElement( | ||
| type = Slate.ElementType.LIST_ITEM, | ||
| text = item.content.joinToString() | ||
| ) | ||
| } | ||
| ) | ||
|
|
||
| RenderedJsonLetter.ParagraphContent.Type.LITERAL, RenderedJsonLetter.ParagraphContent.Type.VARIABLE -> | ||
| Slate.InnerElement( | ||
| type = Slate.ElementType.PARAGRAPH, | ||
| text = (it as RenderedJsonLetter.ParagraphContent.Text).text | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package no.nav.etterlatte.brev.brevbaker | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonSubTypes | ||
| import com.fasterxml.jackson.annotation.JsonTypeInfo | ||
| import no.nav.pensjon.brevbaker.api.model.RenderedJsonLetter | ||
|
|
||
| @JsonTypeInfo( | ||
| use = JsonTypeInfo.Id.NAME, | ||
| include = JsonTypeInfo.As.EXTERNAL_PROPERTY, | ||
| property = "type", | ||
| defaultImpl = Void::class | ||
| ) | ||
| @JsonSubTypes( | ||
| JsonSubTypes.Type(value = RenderedJsonLetter.Block.Title1::class, name = "TITLE1"), | ||
| JsonSubTypes.Type(value = RenderedJsonLetter.Block.Title2::class, name = "TITLE2"), | ||
| JsonSubTypes.Type(value = RenderedJsonLetter.Block.Paragraph::class, name = "PARAGRAPH") | ||
| ) | ||
| interface BrevbakerJSONBlockMixIn | ||
|
|
||
| @JsonTypeInfo( | ||
| use = JsonTypeInfo.Id.NAME, | ||
| include = JsonTypeInfo.As.EXTERNAL_PROPERTY, | ||
| property = "type", | ||
| defaultImpl = Void::class | ||
| ) | ||
| @JsonSubTypes( | ||
| JsonSubTypes.Type(value = RenderedJsonLetter.ParagraphContent.ItemList::class, name = "ITEM_LIST"), | ||
| JsonSubTypes.Type(value = RenderedJsonLetter.ParagraphContent.Text.Literal::class, name = "LITERAL"), | ||
| JsonSubTypes.Type(value = RenderedJsonLetter.ParagraphContent.Text.Variable::class, name = "VARIABLE") | ||
| ) | ||
| interface BrevbakerJSONParagraphMixIn |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hadde det gitt mening med en tredje prosesstype for brev? I denne og forrige
whener det basically en sjekk på om du er en spesiell versjon av automatisk i kraft av revurderingsårsak, men det kunne vært basert på f.eks. prosessTypeREDIGERBAR_AUTOMATISKe.l.Har ikke oversikt over de andre stedene det evt. må håndteres da :p
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, det er ein fristande ide. Samtidig trur eg at vi etter kvart skal over på redigerbar automatisk for alle brev, så usikker på om det vil trengs på sikt 🤔