Commit Graph

29118 Commits

Author SHA1 Message Date
Rishabh Garg
43b8ad5069
Added expiry column for complimentary subscriptions (#15241)
refs https://github.com/TryGhost/Team/issues/1727

- allows adding expiry date to complimentary subscriptions, effectively allowing cardless trials.
- expiry is stored in members<>products mapping table
2022-08-19 08:41:40 +05:30
Fabien "egg" O'Carroll
27f1795a5d Fixed count queries for Post signups and conversions
refs https://github.com/TryGhost/Team/issues/1803
refs https://github.com/TryGhost/Team/issues/1802

We renamed the tables during development and these count queries
were missed.
2022-08-18 19:24:54 -04:00
Fabien "egg" O'Carroll
dd0097e68f Added signup & conversion counts to post index page
refs https://github.com/TryGhost/Team/issues/1818

This is all hidden behind the alpha flag, and is missing the links to filtered
members as that has not been implemented yet.
2022-08-18 19:24:54 -04:00
Fabien "egg" O'Carroll
20726c8fc2 Added signup & conversion counts to Posts API
refs https://github.com/TryGhost/Team/issues/1822

Exposing the values through the API is restricted behind the alpha flag.
We're exposing the values by default when the flag is enabled for now,
but can reconsider that later.
2022-08-18 19:24:54 -04:00
Djordje Vlaisavljevic
0169487745 Removed unused variables
refs https://github.com/TryGhost/Team/issues/1811
2022-08-18 23:18:44 +02:00
Djordje Vlaisavljevic
c38cc89ea5 Added dynamic title to select input field
refs https://github.com/TryGhost/Team/issues/1811
2022-08-18 23:15:17 +02:00
Djordje Vlaisavljevic
d106a741c2 Removed pricing from the select field values
refs https://github.com/TryGhost/Team/issues/1811
2022-08-18 23:15:17 +02:00
Daniel Lockyer
da7b7650c0 Fixed use of static class field
refs 3d80fd982c

- referenced commit moved it from an exported field to a static class
  variable, but I forgot to update it here
2022-08-18 22:34:34 +02:00
Daniel Lockyer
3d80fd982c
Changed BATCH_SIZE to static class field
refs fd6f48d6b2

- this is cleaner and would have avoided the issue fixed in the
  referenced commit
2022-08-18 22:14:54 +02:00
Daniel Lockyer
fd6f48d6b2
Fixed batch size when sending bulk emails
- during a refactor, I moved the `BATCH_SIZE` variable around
- putting the variable export above a more general export means it get
  overwritten and the value is `undefined` outside of the module
- when we chunk the emails, we were chunking in sized of `undefined`,
  so I'm guessing it just defaulted to 1
- this means the email batches were of size 1 instead of 1000 - oops
2022-08-18 22:04:00 +02:00
Rishabh
f2c6ccf3e5 Updated free trial signup design on Portal
refs https://github.com/TryGhost/Team/issues/1724
2022-08-18 22:51:33 +05:30
Simon Backx
da24d13601
Added member attribution events and storage (#15243)
refs https://github.com/TryGhost/Team/issues/1808
refs https://github.com/TryGhost/Team/issues/1809
refs https://github.com/TryGhost/Team/issues/1820
refs https://github.com/TryGhost/Team/issues/1814

### Changes in `member-events` package

- Added MemberCreatedEvent (event, not model)
- Added SubscriptionCreatedEvent (event, not model) 

### Added `member-attribution` package (new)

- Added the AttributionBuilder class which is able to convert a url history to an attribution object (exposed as getAttribution on the service itself, which handles the dependencies)
```
[{
    "path": "/",
    "time": 123
}]
```
to
```
{
    "url": "/",
    "id": null,
    "type": "url"
}
```

- event handler listens for MemberCreatedEvent and SubscriptionCreatedEvent and creates the corresponding models in the database.

### Changes in `members-api` package

- Added urlHistory to `sendMagicLink` endpoint body + convert the urlHistory to an attribution object that is stored in the tokenData of the magic link (sent by Portal in this PR: https://github.com/TryGhost/Portal/pull/256).
- Added urlHistory to `createCheckoutSession` endpoint + convert the urlHistory to attribution keys that are saved in the Stripe Session metadata (sent by Portal in this PR: https://github.com/TryGhost/Portal/pull/256).

- Added attribution data property to member repository's create method (when a member is created)
- Dispatch MemberCreatedEvent with attribution

###  Changes in `members-stripe-service` package (`ghost/stripe`)

- Dispatch SubscriptionCreatedEvent in WebhookController on subscription checkout (with attribution from session metadata)
2022-08-18 17:38:42 +02:00
Simon Backx
59851fc1ab Revert "First iteration of adding in post and page columns to event tables"
This reverts commit 26150ca769.
2022-08-18 17:29:40 +02:00
renovate[bot]
02d66ee30a Update dependency date-fns to v2.29.2 2022-08-18 17:15:58 +02:00
Daniel Lockyer
7ce6b27772
Protected Audit Log page behind labs flag
refs https://github.com/TryGhost/Toolbox/issues/356

- even though I was hiding the button, it's better to prevent going to
  the route entirely by redirecting to the homepage if the labs flag is
  not enabled
2022-08-18 17:03:44 +02:00
Daniel Lockyer
7b160493db
Added support for integration actors in Audit Log UI
refs https://github.com/TryGhost/Toolbox/issues/356

- this enables showing when an integration is the actor doing something
- still need to add a fallback for missing icons
2022-08-18 17:00:56 +02:00
Aileen Nowak
e0602b8159 Fixed explore snapshot 2022-08-18 15:50:28 +01:00
Aileen Nowak
2b151db601 Explore in dark mode 2022-08-18 15:50:28 +01:00
Aileen Nowak
cfd71e4f75 Added pink Ghost orb svg 2022-08-18 15:50:28 +01:00
Aileen Nowak
f2fdf9e671 Added accent color to Explore service 2022-08-18 15:50:28 +01:00
Daniel Lockyer
bbb5cd24c8
Added actions events for integrations and webhooks
refs https://github.com/TryGhost/Toolbox/issues/356

- this allows Ghost to collect CRUD events for integrations and
  webhooks, to eventually be shown in the audit log
2022-08-18 16:47:48 +02:00
Fabien "egg" O'Carroll
37ef0582e6 Added members_subscription_created_events table & model
refs https://github.com/TryGhost/Team/issues/1803
2022-08-18 10:45:53 -04:00
Fabien "egg" O'Carroll
03155a61ff Added members_created_events table & model
refs https://github.com/TryGhost/Team/issues/1802
2022-08-18 10:45:53 -04:00
Daniel Lockyer
f18cc0185b
Fixed showing colors when using yarn dev:debug
- because we use `concurrently`, `debug` thinks it's not inside a TTY,
  so it doesn't show colors
- we can force it to show colors using the DEBUG_COLORS env variable, as
  done in this commit
2022-08-18 15:52:28 +02:00
Simon Backx
d01557cdf8 🐛 Fixed comments not visible in activity feed
refs https://ghost.slack.com/archives/C02G9E68C/p1660830163171599?thread_ts=1660829884.159749&cid=C02G9E68C

- Feature flag was still used, causing comment events to get filtered out
2022-08-18 15:46:21 +02:00
Daniel Lockyer
b10ceb75ff
Aligned user's name to cell center 2022-08-18 15:30:11 +02:00
Daniel Lockyer
35f5a38a17
Altered column sizes for audit log table
- this makes the data clearer to see
2022-08-18 15:28:03 +02:00
Daniel Lockyer
62915cccff
Removed brackets from resource IDs
- I don't think they're needed and it's a little cleaner without
2022-08-18 14:22:59 +02:00
Daniel Lockyer
bde9b84221
Fixed page actions events stored as posts
- this was due to the fact that we use the same model for pages as we do
  for posts, so the hardcoded `post` key was not accurate
- this commit adds support for providing a function to return the key for the
  action type
2022-08-18 14:07:04 +02:00
Daniel Lockyer
9fda97550d
Fixed linking users resource
refs https://github.com/TryGhost/Toolbox/issues/356

- some resources don't have titles, like users, so we should optionally
  see if they have a name
- this is starting to become unwieldy so I'll likely pull this logic out
  in an upcoming commit
2022-08-18 13:30:50 +02:00
Daniel Lockyer
fa158b3831
Added link to Audit Log resource
refs https://github.com/TryGhost/Toolbox/issues/356

- this allows you to click on the title and go to whatever resource was
  acted upon
- if the resource has not be found, it'll just show the resource ID
2022-08-18 13:17:21 +02:00
renovate[bot]
5f4c170d05 Update dependency @tryghost/errors to v1.2.15 2022-08-18 12:02:38 +02:00
renovate[bot]
16cff6d70e Lock file maintenance 2022-08-18 12:01:28 +02:00
Daniel Lockyer
f51226e5fb Organized package dependencies
- cleaned up unused dependencies
- adds missing dependencies that are used in the code
- this should help us be more explicit about the dependencies a package
  uses
2022-08-18 11:55:49 +02:00
Daniel Lockyer
aa00fe5474 Cleaned up unused test utils
- cleans up one boilerplate test and some utils that aren't used
2022-08-18 11:55:49 +02:00
Djordje Vlaisavljevic
1c7f38395c Fixed issue with tier card price
refs https://github.com/TryGhost/Team/issues/1806
2022-08-18 10:28:44 +02:00
Daniel Lockyer
ae336f19cd
Protected against missing NODE_ENV variable
- in the event NODE_ENV isn't set, this would throw an error because
  `startsWith` is a function call on `undefined`
2022-08-18 08:34:53 +02:00
renovate[bot]
0f998e30aa Update sentry-javascript monorepo to v7.11.1 2022-08-17 21:53:41 +02:00
Djordje Vlaisavljevic
824d03c803 Updated error message
refs https://github.com/TryGhost/Team/issues/1811
2022-08-17 21:27:02 +02:00
Djordje Vlaisavljevic
0c49fac5f7 Updated new/edit offer form design
refs https://github.com/TryGhost/Team/issues/1811
2022-08-17 21:18:23 +02:00
Djordje Vlaisavljevic
586a912e47 Updated tier form design
refs https://github.com/TryGhost/Team/issues/1791
2022-08-17 21:18:23 +02:00
renovate[bot]
79f28a82a3 Update sentry-javascript monorepo to v7.11.0 2022-08-17 21:16:25 +02:00
Naz
8b46814700 Reworked image sizes cache to work with async cache
refs https://github.com/TryGhost/Toolbox/issues/364

- The caches can be or async nature. Having await syntax allows to  support both types - sync and async.
2022-08-17 19:03:50 +02:00
Djordje Vlaisavljevic
3cb8226100 Added links to help docs
refs https://github.com/TryGhost/Team/issues/1819
2022-08-17 18:23:38 +02:00
Djordje Vlaisavljevic
cceabac8af Added disabled state for radio buttons
refs https://github.com/TryGhost/Team/issues/1811
2022-08-17 18:23:38 +02:00
Rishabh
f000048223 Fixed odd behavior with saving complimentary members
closes https://github.com/TryGhost/Team/issues/1715
refs https://github.com/TryGhost/Members/pull/407

- when comped boolean was brought back for backwards compatibility, it accidentally opened a path from admin to set comped stripe subscriptions on members on save, as Admin always sends back `comped` value
- since we don't allow stripe comped subscriptions anymore, this caused weird behavior with assigning the default tier on comped stripe subscription.
- this change removes the `json.comped` value to be sent up from Admin to avoid any weird comped changes to the member
2022-08-17 20:53:34 +05:30
James Morris
26150ca769 First iteration of adding in post and page columns to event tables
- Adding in dummy column for page or post to various event table places
- This still requires wiring up with real data

refs https://github.com/TryGhost/Team/issues/1815
2022-08-17 16:20:05 +01:00
Djordje Vlaisavljevic
ee3f458053 Switched custom tooltip to standard one
refs https://github.com/TryGhost/Team/issues/1811
2022-08-17 15:23:54 +02:00
Daniel Lockyer
3ce7e241a1
Added fallback icon to audit log
- in the event we don't have a specific icon, I've just chosen to show
  an `info` one for now
2022-08-17 14:54:54 +02:00
Daniel Lockyer
83702c7e86
Added resource to data available to audit log
- this allows us to hydrate the post title into the UI
- needs work to support non-post and missing resources
2022-08-17 14:43:01 +02:00