Fix/1632/reset street layout global config #1633

Med-H · 2020-12-30T19:12:07Z

Reset layout option and street map max files in global settings

closes #1632
closes #1624

Description

GIVEN a user has opened the global config
WHEN modifying the layout or the street layout maximum treemap files, then resetting the global configuration
THEN layout and max treemap files options should revert to default values.

thuis PR closes this issue.

…log layout improvement, code refactoring

…yout todo

…ibornWolff/codecharta into feature/905/street-map-layout

…s.component.ts

…ontalStreet.ts

…tViewHelper.ts

…calStreet.ts

…MapHelper.ts

…' into fix/1632/reset-street-layout-global-config

Med-H

just modified the comment

BridgeAR · 2021-01-07T12:16:20Z

This does not yet fix our flaky e2e tests:

FAIL app/codeCharta/e2e/url.e2e.ts (44.26 s)
  ● [secure] › should throw errors when file parameters in url are invalid and load sample data instead
    TimeoutError: waiting for selector `.md-select-menu-container.md-active > md-select-menu` failed: timeout 30000ms exceeded
      12 | 		await this.clickChooser()
      13 | 
    > 14 | 		await page.waitForSelector(".md-select-menu-container.md-active > md-select-menu")
         | 		           ^
      15 | 		const content = await page.$eval(".md-select-menu-container.md-active > md-select-menu", element => element["innerText"])
      16 | 		return content.split("\n")
      17 | 	}

BridgeAR

I am a bit surprised that we reformat our changelog all the time. How could we guarantee this does not happen anymore? :-)

BridgeAR · 2021-01-07T12:18:01Z

CHANGELOG.md

+
+-   Global settings not reverting to default ones ([#1632](https://github.com/MaibornWolff/codecharta/issues/1632))
+-   Maximum treemap files shown in squarified node ([#1624](https://github.com/MaibornWolff/codecharta/issues/1624))
+-   Fixed kotlin test ([#1322](https://github.com/MaibornWolff/codecharta/issues/1322))


This part should not be relevant for our customers. Therefore it's something we could in theory mention in "Chore" but I prefer not to add it at all.

Suggested change

- Fixed kotlin test ([#1322](https://github.com/MaibornWolff/codecharta/issues/1322))

BridgeAR · 2021-01-07T12:35:07Z

...c/main/kotlin/de/maibornwolff/codecharta/importer/scmlogparser/input/metrics/CalendarWeek.kt

-        private fun isFirstOrSecondWeek(kalenderWeeknWeek: Int): Boolean {
-            return kalenderWeeknWeek <= 2
+        private fun isFirstOrSecondWeek(calendarWeek: Int): Boolean {
+            return calendarWeek <= 2


BridgeAR · 2021-01-07T12:39:21Z

...c/main/kotlin/de/maibornwolff/codecharta/importer/scmlogparser/input/metrics/CalendarWeek.kt

+                .with(WeekFields.ISO.weekOfWeekBasedYear(), week.toLong())
+                .with(WeekFields.ISO.dayOfWeek(), 1)
+                .withHour(12).withMinute(0).withSecond(0).withNano(0)
+                .withOffsetSameInstant(ZoneOffset.UTC)


This is not immediately obvious what this does. I suggest to add a short comment what this tries to solve :-)

BridgeAR · 2021-01-07T12:54:40Z

visualization/app/codeCharta/ui/codeMap/codeMap.label.service.ts

@@ -117,6 +117,7 @@ export class CodeMapLabelService implements CameraChangeSubscriber {
 		}
 	}

+	// TODO Add a test to ensure that scaling is not additive


This seems to be unrelated?

shaman-apprentice · 2021-01-08T14:37:46Z

...c/main/kotlin/de/maibornwolff/codecharta/importer/scmlogparser/input/metrics/CalendarWeek.kt

+        }
+
+        private fun getWeekDate(year: Int, week: Int): OffsetDateTime? {
+            // returns the date of Monday based on the week and year


[Optional] I like to have longer variable names like getDateOfWeeksMonday instead of comments, which tend to rotten 😇 Guess that would also meet @BridgeAR wish for a comment.

shaman-apprentice · 2021-01-08T14:40:35Z

visualization/app/puppeteer.helper.ts

+// expect-puppeteer toClick timeout does not work it might be the reason of flaky tests,
+// changed default options globally
+// [toClick issue](https://github.com/smooth-code/jest-puppeteer/issues/202)
+setDefaultOptions({ timeout: 6000 }) 


I have always a bad feeling with huge default timeouts 😟 But if it is necessary this shouldn't be a blocker

Med-H and others added 30 commits December 10, 2020 10:16

initial street layout introduction

9e0b5a7

may be a fix for e2e filechooser test

f325174

merge with main

bbd9df1

street layout flattening fix, filechooser e2e fix, global setting dia…

bedfcc4

…log layout improvement, code refactoring

fixed TMStreet layout

aad3b52

added max treemap files

b9590c3

fixing linting, added remark about e2e falky test fix, added streetla…

b43a12d

…yout todo

edited changelog

bfeabc8

Merge branch 'main' into feature/905/street-map-layout

78a9f4c

fixes after @BridgeAR review

45fca20

updated changelog

1fc5132

Merge branch 'feature/905/street-map-layout' of https://github.com/Ma…

af6f58e

…ibornWolff/codecharta into feature/905/street-map-layout

merge with main

b926e1c

Merge branch 'main' into feature/905/street-map-layout

b0d70e1

Merge branch 'main' into feature/905/street-map-layout

766f28f

Merge branch 'main' into feature/905/street-map-layout

013ddf4

Apply code formating #1543

481f7f9

Update visualization/app/codeCharta/ui/maxTreeMapFiles/maxTreeMapFile…

f542ce1

…s.component.ts

Update visualization/app/codeCharta/util/algorithm/streetLayout/horiz…

861dfac

…ontalStreet.ts

Update visualization/app/codeCharta/streetLayoutTodo.md

7bf09a6

Update visualization/app/codeCharta/util/algorithm/streetLayout/stree…

87e2886

…tViewHelper.ts

Update visualization/app/codeCharta/util/algorithm/streetLayout/verti…

297826e

…calStreet.ts

Update visualization/app/codeCharta/util/algorithm/treeMapLayout/tree…

61d6322

…MapHelper.ts

Improve identation #905

d6ef2db

Merge main, Fix label position conflicts #905

732235f

Merge branch 'main' into feature/905/street-map-layout

d3e5576

Fix scaling bug and improve performance

f74aa57

adding layout reset behavior

48831a5

merge main with branch

710461a

Fix hard coded year in unit test

cbe234c

Med-H and others added 13 commits January 4, 2021 19:37

fix #1624

10ce850

fix #1624

c41c7a3

Merge remote-tracking branch 'origin/fix-hard-coded-year-in-unit-test…

8422274

…' into fix/1632/reset-street-layout-global-config

fix test

36dcaa6

fix test

fbb5433

fix test

c94a556

fix flaky test

ac95de2

fix flaky test

d3ebe47

fix flaky Integration test

1431672

added agenda regression tests for 53 week years

5fd378a

Update CalendarWeekTest.kt

fdc9908

Update CalendarWeekTest.kt

4801499

Update CalendarWeekTest.kt

35ce66e

Med-H commented Jan 7, 2021

View reviewed changes

Merge branch 'main' into fix/1632/reset-street-layout-global-config

367a02d

BridgeAR reviewed Jan 7, 2021

View reviewed changes

Med-H added 3 commits January 7, 2021 16:21

possible fix for flaky test timeout

841ada1

added some comments & updated changelog

25a41ce

remove trailing spaces

fa62784

Med-H requested a review from BridgeAR January 8, 2021 11:25

shaman-apprentice approved these changes Jan 8, 2021

View reviewed changes

shaman-apprentice merged commit 14df6a2 into main Jan 11, 2021

shaman-apprentice deleted the fix/1632/reset-street-layout-global-config branch January 11, 2021 08:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/1632/reset street layout global config #1633

Fix/1632/reset street layout global config #1633

Med-H commented Dec 30, 2020 •

edited

Med-H left a comment

BridgeAR commented Jan 7, 2021

BridgeAR left a comment

BridgeAR Jan 7, 2021

BridgeAR Jan 7, 2021

BridgeAR Jan 7, 2021

BridgeAR Jan 7, 2021

shaman-apprentice Jan 8, 2021

shaman-apprentice Jan 8, 2021

Fix/1632/reset street layout global config #1633

Fix/1632/reset street layout global config #1633

Conversation

Med-H commented Dec 30, 2020 • edited

Reset layout option and street map max files in global settings

Description

Med-H left a comment

Choose a reason for hiding this comment

BridgeAR commented Jan 7, 2021

BridgeAR left a comment

Choose a reason for hiding this comment

BridgeAR Jan 7, 2021

Choose a reason for hiding this comment

BridgeAR Jan 7, 2021

Choose a reason for hiding this comment

BridgeAR Jan 7, 2021

Choose a reason for hiding this comment

BridgeAR Jan 7, 2021

Choose a reason for hiding this comment

shaman-apprentice Jan 8, 2021

Choose a reason for hiding this comment

shaman-apprentice Jan 8, 2021

Choose a reason for hiding this comment

Med-H commented Dec 30, 2020 •

edited