* Move group SSO enabled check up
So that we have this available when managed users is enabled. This will be useful in the following commit.
* Notify support when subscription deletion skipped
* Fix rebase conflicts
---------
Co-authored-by: mserranom <mserranom@gmail.com>
GitOrigin-RevId: 8a4abe0742ab6a1c6b15bb17b5cc4863a11010b2
* Sync package-lock
I get this change when running `make install && bin/npm i`
* Add `featureUsage` to LoggedOutUser keys
We might want to change this to something like this:
```
export type NullifyProperties<T> = {
[P in keyof T]: undefined
}
export type LoggedOutUser = {
id: null
} & NullifyProperties<Omit<User, 'id'>>
```
* Revert "Sync package-lock"
This reverts commit 982466eba3f8d72a388d248b66658be0350b2d09.
* Remove `canceledSubscription` types for now
This is breaking the build at the moment. We can work on creating a `Request` that matches our usages of it
GitOrigin-RevId: bb21baba6a074c2169af786a9e56b33beddddd2f
[web] Add missing `countryCode` in new-design plans page and all variants of the interstitial payment page
GitOrigin-RevId: e3a410e89a6745d042f9747a01960618eb622733
* [web] Set Subscription pages to have `layout-react`
* [web] import `header-footer-react` in Subscription pages (!!)
* [web] Add `ol-user` meta tag to the subscription pages (!!)
⚠️ invite_logged_out.pug should be updated instead of setting the user as `{}`
* [web] Fix unit test
* [web] Update User types to handle a logged out user, add `LOGGED_OUT_USER` const
* [web] Add type `User` to `getSessionUser`
* [web] Remove `LOGGED_OUT_USER` const
* [web] Just pass `{ id: null }` as the user
* [web] Remove comment in pugs, it breaks things
* [web] Don't pass the full user to the frontend!!!
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
---------
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 1768f1f13de924a18be43c1a08614000500dcbec
* [web] Wiring work for `/subscription/invites/:token` BS5 migration
* [web] Add SCSS for .enrollment-invite
* [web] Update invite_logged_out PUG file for BS5
* [web] Update `GroupInviteViews` (and children) to BS5
* [web] Update `InviteManaged` to BS5
* [web] Update Logout button
* [web] Update subtitles
This removes the `text-overflow:ellipsis`. I think it's better without it, because it can be an accessibility issue.
* [web] Add margin on inner-card
* [web] Style action buttons in InviteManaged
* [web] Add missing container around Row
This was causing the row to overflow the body.
Increased the col width to compensate.
* [web] Fixup lint
* [web] Fix `ManagedUserCannotJoin` title in BS3 (!)
I checked all the other `OLNotification`: we don't use `title` anywhere else
* [web] Put title in OLNotification content
See https://github.com/overleaf/internal/pull/20640#discussion_r1777551257
* [web] Use translations for "aria-label="Email address""
* [web] Handle OLButton `isLoading` in `bs3Props`
* [web] Remove duplicated `btn` class
* [web] Add margin-bottom to InviteManaged title and fix logout button CSS in BS3
* [web] Adjust col class in Pug file for BS3 and BS5
* [web] Revert migration to OLNotification
Revert back to `@/shared/components/notification`
* [web] Add note to remove .team-invite-name after BS5 migration
* [web] Set `btn-link-logout` in BS3 only
* [web] Update OLButton so other classNames automatically get passed to the BS3 implementation
* [web] Revert OLButton changes for BS3 classnames
Co-authored-by: Rebeka <rebeka.dekany@overleaf.com>
* [web] Update services/web/modules/group-settings/frontend/js/components/invite-managed.tsx
Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
* [web] Use OLFormGroup `controlId`
---------
Co-authored-by: Rebeka <rebeka.dekany@overleaf.com>
Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
GitOrigin-RevId: 64b3f79c83002a9c9585bfb8e344e80b2e8eac5c
Eric Mc Sween