Cleanup require import #2139

omsaggau · 2023-10-10T14:16:52Z

No description provided.

…to cleanup-require-import

annesiri · 2023-10-12T12:49:07Z

Generelt ser jeg at det nå ligger en del tomme linjer inne mellom importene, og en del steder er det ikke linjeskift etter importer og før implementasjonen starter. Jeg kunne ønsket meg at det var lettere å kjapt se hva som hører sammen, men det er kanskje ikke en del av denne oppgaven? Eller er det noe eslint/prettier kan fikse for oss det også?

johnnadeluy · 2023-10-13T08:14:59Z

So far, I've identified a few "util is not defined" errors:

ReferenceError: "util" is not defined
org.openjdk.nashorn.internal.runtime.ECMAException: ReferenceError: "util" is not defined

Can be found in:

Dashboard, "Kommende publiseringer" and "Spørringer" -> "Andre". When manually updating fetch statreg statistics under "Spørringer".
Best-bet.
Custom selectors have "Service error: Unknown error" due to the same util error.
Highcharts.
Possible other places as well?

omsaggau · 2023-10-13T08:55:09Z

So far, I've identified a few "util is not defined" errors:

ReferenceError: "util" is not defined
org.openjdk.nashorn.internal.runtime.ECMAException: ReferenceError: "util" is not defined

Can be found in:

Dashboard, "Kommende publiseringer" and "Spørringer" -> "Andre". When manually updating fetch statreg statistics under "Spørringer".

Best-bet.

Custom selectors have "Service error: Unknown error" due to the same util error.

Highcharts.

Possible other places as well?

Resolved. Alle these placese used arrayUtils which was where the bug was.

annesiri · 2023-10-12T10:58:16Z

src/main/resources/site/parts/statistics/statistics.ts

@@ -42,7 +44,7 @@ function renderPart(req: XP.Request): XP.Response {

  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment


Tror ikke vi lenger trenger eslint-unntakene etter at du har ryddet (linje 40, 45 og 46).

annesiri · 2023-10-12T11:09:33Z

src/main/resources/site/parts/relatedKostra/relatedKostra.ts

    const mode: string = pageMode(req)
    if (!municipality && mode === 'edit') {
      const siteConfig = getSiteConfig<XP.SiteConfig>()
      if (!siteConfig) throw Error('No site config found')

      municipality = getMunicipality({
        code: siteConfig.defaultMunicipality,
-      } as unknown as XP.Request)
+      } as unknown as RequestWithCode)


Skjønner ikke hvorfor vi går via unknown her? Gjør ikke det implisitt at vi mister typesjekken? (Samme kommentar gjelder for linje 32). Er vel kanskje litt på siden av oppgaven, men siden vi likevel er inne og fikser typen...

annesiri · 2023-10-12T11:20:44Z

src/main/resources/site/parts/pifCalculator/pifCalculator.ts

Ser ut som det ligger inne et es-lint-unntak på linje 102 som ikke lenger er nødvendig.

annesiri · 2023-10-12T11:29:58Z

src/main/resources/site/parts/mailChimpForm/mailChimpForm.ts


 export function get(req: XP.Request) {
  const config = getComponent<XP.PartComponent.MailChimpForm>()?.config
  if (!config) throw Error('No part found')

-  const phrases: Phrases = getPhrases(getContent()) as Phrases
+  const currentContent = getContent() ?? ({} as Content)
+  const phrases: Phrases = getPhrases(currentContent) as Phrases


Phrases er typet dobbelt. Siden det er satt as Phrases trengs vel ikke : Phrases også?

annesiri · 2023-10-12T11:31:54Z

src/main/resources/site/parts/kpiCalculator/kpiCalculator.ts

-  const language: Language = getLanguage(page)
-  const phrases: Phrases = language.phrases as Phrases
+  const language = getLanguage(page)
+  const phrases: Phrases = language?.phrases as Phrases


Her er også typen til phrases dobbelt definert (se forøvrig forrige kommentar)

src/main/resources/lib/ssb/parts/highcharts/data/statBank.ts

annesiri · 2023-10-12T12:33:23Z

src/main/resources/lib/ssb/parts/highcharts/data/htmlTable.ts

-import { Content } from '/lib/xp/content'
-import type { Highchart } from '/site/content-types'
-import { RowValue } from '/lib/ssb/utils/utils'
+import { RowValue, getRowValue } from '/lib/ssb/utils/utils'
 import { toString } from '/lib/vendor/ramda'
 // @ts-ignore


fjern ts-ignore her

annesiri · 2023-10-12T12:39:27Z

src/main/resources/lib/ssb/dataset/calculator.ts

 import { DatasetRepoNode } from '/lib/ssb/repo/dataset'
+import { datasetOrUndefined } from '/lib/ssb/cache/cache'
+import { type CalculatorConfig, type GenericDataImport } from '/site/content-types'
 /* eslint-disable new-cap */


Ser ut som disse to linjene med unntak henger igjen og ikke trengs lenger??

annesiri · 2023-10-12T13:34:58Z

src/main/resources/lib/ssb/repo/common.ts

ts-ignore på linje 110 tror jeg kan fjernes nå

annesiri · 2023-10-12T13:36:05Z

src/main/resources/admin/tools/bestbet/bestbet.ts

Ser ut som ts-ignore på linje 32 kan fjernes.

johnnadeluy · 2023-10-13T12:23:43Z

Highcharts with excel as their data source get the following error: TypeError: _striptags is not a function

johnnadeluy · 2023-10-16T05:48:54Z

src/main/resources/site/parts/pifCalculator/pifCalculator.ts

-  const language: Language = getLanguage(page)
-  const phrases: Phrases = language.phrases as Phrases
+  const language = getLanguage(page)
+  const phrases: Phrases = language?.phrases as Phrases


Phrases is typed twice

sonarqubecloud · 2023-10-24T08:38:34Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
21 Code Smells

No Coverage information
1.1% Duplication

omsaggau added 5 commits September 25, 2023 17:19

Change from require to import

c4f2625

Merge branch 'master' of https://github.com/statisticsnorway/mimir in…

180455f

…to cleanup-require-import

Add eslint plugin to autofix duplicate imports

b45b7e4

add lint to fix imports

6615022

The big one

bfdbc88

auto-assign bot assigned johnnadeluy Oct 10, 2023

Add newline after imports

93123d3

annesiri reviewed Oct 13, 2023

View reviewed changes

Remove various ignore comments

2698df2

johnnadeluy reviewed Oct 16, 2023

View reviewed changes

omsaggau added 2 commits October 17, 2023 09:21

Fix striptags

b752c2f

Merge

126ce55

johnnadeluy approved these changes Oct 19, 2023

View reviewed changes

omsaggau changed the base branch from master to develop October 24, 2023 08:19

merge

d8c3eac

omsaggau merged commit cd4c2a4 into develop Oct 24, 2023
3 of 4 checks passed

omsaggau deleted the cleanup-require-import branch October 24, 2023 08:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup require import #2139

Cleanup require import #2139

omsaggau commented Oct 10, 2023

annesiri commented Oct 12, 2023

johnnadeluy commented Oct 13, 2023 •

edited

Loading

omsaggau commented Oct 13, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

annesiri Oct 12, 2023

johnnadeluy commented Oct 13, 2023

johnnadeluy Oct 16, 2023

sonarqubecloud bot commented Oct 24, 2023

		@@ -42,7 +44,7 @@ function renderPart(req: XP.Request): XP.Response {

		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment

Cleanup require import #2139

Cleanup require import #2139

Conversation

omsaggau commented Oct 10, 2023

annesiri commented Oct 12, 2023

johnnadeluy commented Oct 13, 2023 • edited Loading

omsaggau commented Oct 13, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

johnnadeluy commented Oct 13, 2023

Choose a reason for hiding this comment

sonarqubecloud bot commented Oct 24, 2023

johnnadeluy commented Oct 13, 2023 •

edited

Loading