[#944] Resolve Merge Conflict #2139
Merged
Conversation
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
Currently, users are unable to select a zoom range that includes the until date. This results in misleading data being presented to users.
…ense#2041) Chrome bug is causing cypress to fail to open a browser on Github Actions, causing frontend tests and CI to fail. Upgrading cypress to greater than 12.15.0 will fix this issue. Let's upgrade cypress to fix the failing CI.
Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate the rest of the JavaScript code to TypeScript code to facilitate future changes to the code.
…posense#2040) Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate the rest of the JavaScript code to TypeScript code to facilitate future changes to the code.
Currently, Cypress zoom feature tests are failing due to a recent change in behavior caused by a bug fix. With the tests failing, we are unable to detect any future regressions. Let's update the Cypress tests to test for the new intended behavior.
…#2043) Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate random-color-generator.js JavaScript code to TypeScript code to facilitate future changes to the code.
…sense#2036) Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate the rest of the JavaScript code to TypeScript code to facilitate future changes to the code.
Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate the rest of the JavaScript code to TypeScript code to facilitate future changes to the code.
Bumps [zod](https://github.com/colinhacks/zod) from 3.20.6 to 3.22.3. - [Release notes](https://github.com/colinhacks/zod/releases) - [Changelog](https://github.com/colinhacks/zod/blob/master/CHANGELOG.md) - [Commits](colinhacks/zod@v3.20.6...v3.22.3) --- updated-dependencies: - dependency-name: zod dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@cypress/request](https://github.com/cypress-io/request) to 3.0.1 and updates ancestor dependency [cypress](https://github.com/cypress-io/cypress). These dependencies need to be updated together. Updates `@cypress/request` from 2.88.12 to 3.0.1 - [Release notes](https://github.com/cypress-io/request/releases) - [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md) - [Commits](cypress-io/request@v2.88.12...v3.0.1) Updates `cypress` from 12.17.4 to 13.3.0 - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v12.17.4...v13.3.0) --- updated-dependencies: - dependency-name: "@cypress/request" dependency-type: indirect - dependency-name: cypress dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate the rest of the JavaScript code to TypeScript code to facilitate future changes to the code.
Currently, when granularity is set to day or week, clicking on a ramp will open up a zoom view where commit messages are not being displayed and sorting by insertions does not result in any sorting. Let's fix the unintended behaviour of the zoom view.
Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate repo-sorter.js to TypeScript code to facilitate future changes to the code.
Currently, there is still some JavaScript code which remains unmigrated. This allows for type unsafe code to be written, potentially resulting in unintended behavior. Let's migrate safari_date.js to TypeScript code to facilitate future changes to the code.
Currently, frontend linter is failing due to lint scripts checking javascript files, the last of which has been removed in PR reposense#2053. Lets update the lint command to exclude javascript files front the check.
…f classes (reposense#2104) Classes in the `parser` package as of now are not properly organised, with exceptions, types and parser classes being found in the same directory level. This does not follow the convention established by other packages, whereby logically similar classes are further grouped into sub-packages. Let's move to refactor the `parser` package to ensure that it follows the overall structure of the other packages and to increase the level of organisation within the `parser` package.
…osense#2107) Fix broken link to DevOps Guide in Learning Basics page. Under the DevOps section in the developer guide, the link to DevOps guide leads a Wiki link instead of redirecting to the DevOps guide on the actual Reposense website. Let's fix the broken link by changing the address to the correct page.
Fix nondeterministically failing zoomFeature cypress test The "range changes in chartview should reflect in zoom" test in chartView_zoomFeature.cy.js fails because as time passes, the coordinates in the ramp that correspond to the desired zoom area change. Let's add an "until" filter to the relevant cypress tests to stop this from happening
…omplexity (reposense#2078) Refactor RepoConfiguration to simplify constructor complexity. Currently, the constructors for the `RepoConfiguration` class is very complex, involving up to 18 parameters at once, and is not easily extensible. With the proposed changes, the constructor now follows the Builder pattern, by using a nested class `Builder` that helps to compose config parameters in a way that is much more modular and comprehensible, enhancing code quality and reducing confusion among developers. However, it must be noted that `Builder` objects are not reusable as of now, and that more combinations of arguments are permitted due to the removal of constructors for `RepoBuilder`, which previously helped to ensure the correctness of parameter combinations. Let's refactor `RepoConfiguration` to simplify the complexity of the constructor and increase modularity of the code.
Implement Title Component With a new focus on allowing users to use RepoSense as a portfolio tool, more functionality supporting this focus is needed. Let's allow users to add customizable content in Markdown/HTML format at the top of the report for a personalized introduction.
The segment component CSS currently resides in the c-authorship-file component. Moving it to the segment component would make it easier to edit the segment component in the future. Let's move the CSS into c-segment.vue.
# Conflicts: # frontend/src/utils/segment.ts # frontend/src/views/c-authorship.vue # src/main/java/reposense/parser/ArgsParser.java # src/main/java/reposense/util/StringsUtil.java
…e#2135) The code highlighting is not working as the colors are not being recognized by the newly extracted c-segment.vue file. This is because the defined colors were not imported into the file. Let us add the color styles import to restore code highlighting functionality.
Fix Blurry Favicon on Reports The favicon looks blurry on generated reports. Let's replace this with a clearer image.
…tion`'s Builder Pattern (reposense#2118) Current implementation of the Builder pattern within `CliArguments` does not conform that in `RepoConfiguration`. Let's move to refactor `CliArguments` to reduce class attribute duplication across `CliArguments` and `CliArguments::Builder` and to enhance overall code quality.
# Conflicts: # src/main/java/reposense/parser/ArgsParser.java
# Conflicts: # src/main/java/reposense/model/CliArguments.java
|
It is a little hard to tell what conflicts are resolved in this PR as it is. Would it be possible to mark out where you've had to resolve conflicts, perhaps with the original changes before the conflict was resolved? |
|
@gok99 Here's a short summary of the merge conflicts. Hope this helps a bit.
I think it is easier to just merge this and look at the diff of 2 branches instead. A sample one is available here. The merge conflicts are simply relocating my codes to the new places as the old file/structures are changed. (frontend is splitting the code into smaller files and backend has updated the builder pattern). |
gok99
approved these changes
Mar 5, 2024
ckcherry23
approved these changes
Mar 5, 2024
There was a problem hiding this comment.
Thanks a lot @SkyBlaise99 for creating #2140 to view the diff. Frontend changes look good to me.
I may have a few simple code quality suggestions we could tackle in another PR:
- Add a comment to line 22 in
c-segment.vueto show that the author color is applied only when the author color exists, else it takes the default mui color value (This was not your change, but since there is a lot of highlight color logic now, this could help). - Define a type for
lastStatein line 413 ofc-authorship.vuethat includes both the last known author's name and the last line's full credit status for easier comparison, if possible.
|
Thanks for the feedbacks. For those code quality suggestions, I think they will be easier to work on after the feature branch is settled. Can this PR be merged so I can put a new PR to merge the feature branch into master like #2140? Thanks. |
|
The following links are for previewing this pull request:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of #944
Proposed commit message
Other information
This PR has no new feature, purely just for updating and resolving merge conflicts.