Skip to content

add import of missing Angular interfaces - #2870

Closed
saschaszott wants to merge 55 commits into
DSpace:mainfrom
saschaszott:patch-21
Closed

add import of missing Angular interfaces#2870
saschaszott wants to merge 55 commits into
DSpace:mainfrom
saschaszott:patch-21

Conversation

@saschaszott

Copy link
Copy Markdown
Contributor

Description

This PR adds imports of missing Angular interfaces, e.g. OnInit, OnDestroy etc.

@tdonohue , is it possible to add an appropriate lint check?

@saschaszott

saschaszott commented Mar 20, 2024

Copy link
Copy Markdown
Contributor Author

@tdonohue , maybe the best way of handling this issue (missing imports of Angular lifecycle interfaces) in the ongoing development efforts is the adoption of an additional lint rule as suggested by @ybnd .

@alanorth

Copy link
Copy Markdown
Contributor

Small nitpick, could this be rebased and squashed into one commit to keep our git log neat and tidy? Thanks!

@saschaszott

Copy link
Copy Markdown
Contributor Author

Small nitpick, could this be rebased and squashed into one commit to keep our git log neat and tidy? Thanks!

@alanorth should I open a new PR or do you plan to squash all the commits at merge time?

@alanorth

alanorth commented Mar 21, 2024

Copy link
Copy Markdown
Contributor

Hi @saschaszott, we could rebase/squash on GitHub when merging if we remember, but it would be easy for you to do in your branch as well. Assuming you have a git remote for the upstream DSpace repository you could do:

$ git rebase -i upstream/dspace-7_x

Then you will get a list of commits with actions to be performed. You change everything after the first one from pick to squash and git will combine them all into the first commit and let you enter a new commit message after saving:

pick 6dc2ea3 added missing interfaces
squash 8bce1d8 added missing OnInit interface                                                                                                          
squash fee794b added missing interface OnInit
...

@tdonohue
tdonohue requested a review from atarix83 May 9, 2024 14:50
added missing OnInit interface

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interfaces OnDestroy and OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interfaces OnDestroy, OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

made return type explicit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

fixed lint warning

fixed lint warnings

fixed lint warnings

fixed lint warnings

fixed lint warnings

fixed lint warnings
@saschaszott
saschaszott changed the base branch from main to dspace-7_x May 14, 2024 22:06
@saschaszott
saschaszott changed the base branch from dspace-7_x to main May 14, 2024 22:07
author Sascha Szott <szott@gmx.de> 1710931157 +0100
committer Sascha Szott <szott@gmx.de> 1715725474 +0200

parent f59510d
author Sascha Szott <szott@gmx.de> 1710931157 +0100
committer Sascha Szott <szott@gmx.de> 1715725084 +0200

parent f59510d
author Sascha Szott <szott@gmx.de> 1710931157 +0100
committer Sascha Szott <szott@gmx.de> 1715725034 +0200

parent f59510d
author Sascha Szott <szott@gmx.de> 1710931157 +0100
committer Sascha Szott <szott@gmx.de> 1715725011 +0200

parent f59510d
author Sascha Szott <szott@gmx.de> 1710931157 +0100
committer Sascha Szott <szott@gmx.de> 1715724942 +0200

parent f59510d
author Sascha Szott <szott@gmx.de> 1710931157 +0100
committer Sascha Szott <szott@gmx.de> 1715724838 +0200

added missing interfaces

added missing OnInit interface

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interfaces OnDestroy and OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interfaces OnDestroy, OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

made return type explicit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

fixed lint warning

fixed lint warnings

fixed lint warnings

fixed lint warnings

fixed lint warnings

fixed lint warnings

added missing OnInit interface

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interfaces OnDestroy and OnInit

added missing interface OnInit

added missing interfaces OnDestroy, OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

added missing interface OnInit

made return type explicit

fixed lint warning

fixed lint warning

fixed lint warnings

fixed lint warnings

fixed lint warnings
@saschaszott

Copy link
Copy Markdown
Contributor Author

Hi @saschaszott, we could rebase/squash on GitHub when merging if we remember, but it would be easy for you to do in your branch as well. Assuming you have a git remote for the upstream DSpace repository you could do:

$ git rebase -i upstream/dspace-7_x

Then you will get a list of commits with actions to be performed. You change everything after the first one from pick to squash and git will combine them all into the first commit and let you enter a new commit message after saving:

pick 6dc2ea3 added missing interfaces
squash 8bce1d8 added missing OnInit interface                                                                                                          
squash fee794b added missing interface OnInit
...

@alanorth , this does not work as expected. I get tons of merge conflicts. Any ideas how to handle this situation?

@alanorth

Copy link
Copy Markdown
Contributor

@saschaszott Ah, in my comment I suggested rebasing on top of dspace-7_x, but your pull request is against main so you should rebase (and squash) on top of that instead. If your commits apply clean, then a squashed version of the commits should as well (the only difference is one large commit instead of many small ones).

@saschaszott

Copy link
Copy Markdown
Contributor Author

@alanorth , thank you. This does not work either - I'm lost in merge conflicts after running git rebase -i upstream main. I will try another approach and create a new PR (with one commit).

@saschaszott

Copy link
Copy Markdown
Contributor Author

@alanorth , @tdonohue : you can find the squashed version of this PR in #3048 - I'll close this PR

@saschaszott
saschaszott deleted the patch-21 branch May 15, 2024 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants