Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge multitendancy in main #1017

Merged
merged 19 commits into from
Oct 14, 2024
Merged

Merge multitendancy in main #1017

merged 19 commits into from
Oct 14, 2024

Conversation

kcinay055679
Copy link
Collaborator

No description provided.

@kcinay055679 kcinay055679 force-pushed the multitenancy_main-merge branch from 4d2f9ed to 3c73f83 Compare September 30, 2024 10:57
@kcinay055679 kcinay055679 changed the base branch from multitenancy_main to main September 30, 2024 10:58
@kcinay055679 kcinay055679 force-pushed the multitenancy_main-merge branch from 4244e29 to 661f2fc Compare September 30, 2024 12:19
@kcinay055679 kcinay055679 changed the title squash allchanges Merge multitendancy in main Sep 30, 2024
@kcinay055679 kcinay055679 linked an issue Oct 1, 2024 that may be closed by this pull request
Multitenancy_main auf Main rebasen #1022
Closed
pizzi-cato
pizzi-cato reviewed Oct 3, 2024
View reviewed changes
Copy link
Collaborator

@pizzi-cato pizzi-cato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • merge problems are solved in backend
  • try to fix e2e tests

@pizzi-cato pizzi-cato force-pushed the multitenancy_main-merge branch from e786609 to a853885 Compare October 3, 2024 12:26
@clean-coder clean-coder marked this pull request as ready for review October 3, 2024 12:37
@pizzi-cato pizzi-cato requested a review from peggimann October 3, 2024 12:38
pizzi-cato
pizzi-cato previously requested changes Oct 3, 2024
View reviewed changes
Copy link
Collaborator

@pizzi-cato pizzi-cato left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • e2e tests fixed
  • application runs for pitc (data available, team administration looks good for me)
  • application fails while authenticating acme (loop for ever, even we do not use Shibboleth :-) )

@clean-coder
Copy link
Collaborator

clean-coder commented Oct 3, 2024 •
edited
Loading

Ein paar Infos zu Einloggen mit dem Browser als acme

  • einloggen (authentication) als acme funktioniert mit dem aktuellen Stand im Branch nicht mehr
  • Ursache ist, dass die "angular-oauth2-oidc": "^17.0.0" Library ersetzt wurde durch "angular-auth-oidc-client": "^18.0.1" . Man kann die git History vom package.json File anschauen und sieht dann, das am 09.09.2024 beim fixen eine Bugs auf die andere Library umgestellt wurde.
  • Wenn man wieder auf die alte Library umstellt (und den Code in den entsprechenden Klassen und Tests anpasst), kann auch wieder einloggen als acme. Dies wäre sicherlich ein gangbarer Weg fürs Merging in den master. Man kann dann in einem spätere Schritt entscheiden, ob man längerfristig weitergehen will (mit der alten oder neuen Library und den möglichen Konsequenzen).

@clean-coder
Copy link
Collaborator

clean-coder commented Oct 4, 2024 •
edited
Loading

Tip zum Einloggen mit dem Browser als acme

Betroffen sind aus meiner Sicht folgende 18 Files (alle im frontend). Ich habe diese mal als "POC" auf den alten Stand zurückgesetzt, und dann hat es mit acme wieder gekappt.

package.json
src/app/app-routing.module.ts
src/app/app.component.spec.ts
src/app/app.component.ts
src/app/app.module.ts
src/app/components/application-top-bar/application-top-bar.component.spec.ts
src/app/components/application-top-bar/application-top-bar.component.ts
src/app/components/key-result-form/key-result-form.component.spec.ts
src/app/components/key-result-form/key-result-form.component.ts
src/app/components/keyresult-dialog/keyresult-dialog.component.spec.ts
src/app/components/objective-filter/objective-filter.component.spec.ts
src/app/components/overview/overview.component.spec.ts
src/app/guards/auth.guard.spec.ts
src/app/guards/auth.guard.ts
src/app/interceptors/oauth.interceptor.spec.ts
src/app/interceptors/oauth.interceptor.ts
src/environments/environment.prod.ts
src/environments/environment.ts

@kcinay055679 kcinay055679 force-pushed the multitenancy_main-merge branch from e450c9a to 1b22d1d Compare October 11, 2024 11:49
peggimann
peggimann requested changes Oct 11, 2024
View reviewed changes
Copy link
Collaborator

@peggimann peggimann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also Login does not work properly atm

frontend/cypress/e2e/tab.cy.ts Show resolved Hide resolved
@peggimann peggimann merged commit db6bcdf into main Oct 14, 2024
5 checks passed
@kcinay055679 kcinay055679 self-assigned this Oct 28, 2024
@peggimann peggimann deleted the multitenancy_main-merge branch November 11, 2024 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peggimann peggimann peggimann approved these changes

@pizzi-cato pizzi-cato pizzi-cato left review comments

Assignees

@kcinay055679 kcinay055679

Labels
None yet
Projects
None yet
Milestone
UX Überarbeitung und Bug Fixing
Development

Successfully merging this pull request may close these issues.

Multitenancy_main auf Main rebasen
4 participants
@kcinay055679 @clean-coder @peggimann @pizzi-cato