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.

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

Release Candidate - v6.8.0 #640

Merged
merged 15 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## [6.8.0](https://github.com/jwplayer/ott-web-app/compare/v6.7.0...v6.8.0) (2024-11-08)


### Features

* add support for featured custom param ([#632](https://github.com/jwplayer/ott-web-app/issues/632)) ([9ea7884](https://github.com/jwplayer/ott-web-app/commit/9ea78849d24a84652c34bcd7a62c5576ed068b99))
* **auth:** add optional captcha validation to registration ([#630](https://github.com/jwplayer/ott-web-app/issues/630)) ([fac471c](https://github.com/jwplayer/ott-web-app/commit/fac471cde71239f98db60141542ec6f764d7650a))
* **home:** add hero shelf type and deprecate content.featured ([#638](https://github.com/jwplayer/ott-web-app/issues/638)) ([8388404](https://github.com/jwplayer/ott-web-app/commit/8388404a25192d1562654bfe0af198307cb22c61))
* **home:** add jumbotron featured shelf ([#628](https://github.com/jwplayer/ott-web-app/issues/628)) ([08bf7c0](https://github.com/jwplayer/ott-web-app/commit/08bf7c001b5f3d10e0e885b27f2cec4188ccaca5))
* **i18n:** support translations for shelves titles and menu labels ([#612](https://github.com/jwplayer/ott-web-app/issues/612)) ([8d13515](https://github.com/jwplayer/ott-web-app/commit/8d13515c10dc91d477f4bcece239dc61474fec4b))
* **payment:** add optional captcha validation to payments ([#631](https://github.com/jwplayer/ott-web-app/issues/631)) ([afa7d6a](https://github.com/jwplayer/ott-web-app/commit/afa7d6a17428ca6f801c3ff99e7f322d257d8a8f))
* **project:** add custom menu label to sidebar ([#637](https://github.com/jwplayer/ott-web-app/issues/637)) ([b73ae54](https://github.com/jwplayer/ott-web-app/commit/b73ae542db10129ad1278410aabc754b820a93e4))
* **project:** remove ott analytics ([beae9bd](https://github.com/jwplayer/ott-web-app/commit/beae9bd4278f8e4a1e2f0f64e7456a14300e9c3d))
* **project:** ui improvements and support light background ([620007b](https://github.com/jwplayer/ott-web-app/commit/620007b69f888d415c35162b4396adfccbba8b26))


### Bug Fixes

* access bridge flaky tests ([#627](https://github.com/jwplayer/ott-web-app/issues/627)) ([1ae469b](https://github.com/jwplayer/ott-web-app/commit/1ae469b4c7b1f6922f6504b42d3445f7b9310cd8))
* **project:** improve featured shelf and general ui ([#634](https://github.com/jwplayer/ott-web-app/issues/634)) ([085e245](https://github.com/jwplayer/ott-web-app/commit/085e2452290f11e8884294be0454bab9ea6f0895))
* remove blue link color in hero description ([adf388c](https://github.com/jwplayer/ott-web-app/commit/adf388c968e11ba15c72d3ddc6679f940fb64076))

## [6.7.0](https://github.com/jwplayer/ott-web-app/compare/v6.6.0...v6.7.0) (2024-09-27)


Expand Down
191 changes: 0 additions & 191 deletions docs/features/video-analytics.md

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jwp/ott",
"version": "6.7.0",
"version": "6.8.0",
"private": true,
"license": "Apache-2.0",
"repository": "https://github.com/jwplayer/ott-web-app.git",
Expand Down
9 changes: 9 additions & 0 deletions packages/common/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@ export const PLAYLIST_CONTENT_TYPE = {
live: 'live',
} as const;

// Some predefined shelf types of JW
export const SHELF_LAYOUT_TYPE = {
// Fullwidth hero, only available as the first shelf (index === 0)
hero: 'hero',
// Larger cards
featured: 'featured',
// By default: standard size cards (default)
} as const;

// OTT shared player
export const OTT_GLOBAL_PLAYER_ID = 'M4qoGvUk';

Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/controllers/AccountController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ export default class AccountController {
await this.refreshEntitlements?.();
};

register = async (email: string, password: string, referrer: string, consentsValues: CustomerConsent[]) => {
register = async (email: string, password: string, referrer: string, consentsValues: CustomerConsent[], captchaValue?: string) => {
try {
const response = await this.accountService.register({ email, password, consents: consentsValues, referrer });
const response = await this.accountService.register({ email, password, consents: consentsValues, referrer, captchaValue });

if (response) {
const { user, customerConsents } = response;
Expand Down
10 changes: 7 additions & 3 deletions packages/common/src/controllers/CheckoutController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ export default class CheckoutController {
};

//
paymentWithoutDetails = async (): Promise<Payment> => {
paymentWithoutDetails = async ({ captchaValue }: { captchaValue?: string } = {}): Promise<Payment> => {
const { order } = useCheckoutStore.getState();

if (!order) throw new Error('No order created');

const response = await this.checkoutService.paymentWithoutDetails({ orderId: order.id });
const response = await this.checkoutService.paymentWithoutDetails({ orderId: order.id, captchaValue });

if (response.errors.length > 0) throw new Error(response.errors[0]);
if (response.responseData.rejectedReason) throw new Error(response.responseData.rejectedReason);
Expand Down Expand Up @@ -169,7 +169,7 @@ export default class CheckoutController {
return response.responseData;
};

initialAdyenPayment = async (paymentMethod: AdyenPaymentMethod, returnUrl: string): Promise<InitialAdyenPayment> => {
initialAdyenPayment = async (paymentMethod: AdyenPaymentMethod, returnUrl: string, captchaValue?: string): Promise<InitialAdyenPayment> => {
const { order } = useCheckoutStore.getState();

if (!order) throw new Error('No order created');
Expand All @@ -181,6 +181,7 @@ export default class CheckoutController {
returnUrl: returnUrl,
paymentMethod,
customerIP: await this.getCustomerIP(),
captchaValue,
});

if (response.errors.length > 0) throw new Error(response.errors[0]);
Expand Down Expand Up @@ -212,12 +213,14 @@ export default class CheckoutController {
cancelUrl,
errorUrl,
couponCode = '',
captchaValue,
}: {
successUrl: string;
waitingUrl: string;
cancelUrl: string;
errorUrl: string;
couponCode: string;
captchaValue?: string;
}): Promise<{ redirectUrl: string }> => {
const { order } = useCheckoutStore.getState();

Expand All @@ -230,6 +233,7 @@ export default class CheckoutController {
cancelUrl,
errorUrl,
couponCode,
captchaValue,
});

if (response.errors.length > 0) throw new Error(response.errors[0]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export default class CleengAccountService extends AccountService {
};
};

register: Register = async ({ email, password, consents }) => {
register: Register = async ({ email, password, consents, captchaValue }) => {
const localesResponse = await this.getLocales();

this.handleErrors(localesResponse.errors);
Expand All @@ -194,6 +194,7 @@ export default class CleengAccountService extends AccountService {
currency: localesResponse.responseData.currency,
publisherId: this.publisherId,
customerIP: await this.getCustomerIP(),
captchaValue,
};

const { responseData: auth, errors }: ServiceResponse<AuthData> = await this.cleengService.post('/customers', JSON.stringify(payload));
Expand Down
Loading
Loading