Skip to content

Commit

Permalink
chore: Merge pull request #397 from jwplayer/release-candidate (v4.31.0)
Browse files Browse the repository at this point in the history
v4.31.0 Release Candidate
  • Loading branch information
dbudzins authored Nov 27, 2023
2 parents d744ee0 + 7a67e11 commit 3b47d03
Show file tree
Hide file tree
Showing 66 changed files with 3,609 additions and 221 deletions.
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
## [4.31.0](https://github.com/jwplayer/ott-web-app/compare/v4.30.0...v4.31.0) (2023-11-13)


### Features

* **project:** ads countdown ([dab3804](https://github.com/jwplayer/ott-web-app/commit/dab380481d53a9ab5d33d56ac78673f6040d6d46))
* **project:** ads integration ([044c40f](https://github.com/jwplayer/ott-web-app/commit/044c40f33874f8c35b7394c7c71c3d715bab78f1))
* **project:** fetch ads in PlayerContainer ([b0eb27a](https://github.com/jwplayer/ott-web-app/commit/b0eb27a742304063b1bc34afb98a97465a37ce89))
* **project:** per media ads ([f27283e](https://github.com/jwplayer/ott-web-app/commit/f27283eafd6265c8bebd64b012ed9c56de6f36cb))
* **project:** rename hooks ([71dc1b8](https://github.com/jwplayer/ott-web-app/commit/71dc1b84d805310a44ff53bc0320ecea60a946ab))
* **project:** use ternanry operator to get ads ([53c3e00](https://github.com/jwplayer/ott-web-app/commit/53c3e00e87f64e0008f576fb9f6c2947eb117f32))
* reintroduce custom registration fields ([03d277c](https://github.com/jwplayer/ott-web-app/commit/03d277cdd69bd339d9993e4b9b9d44816165887c))


### Bug Fixes

* added e2e coverage for custom register fields ([42cd471](https://github.com/jwplayer/ott-web-app/commit/42cd471d4092588f97cf723106e74f40f0802e2e))
* code review suggestions ([631f342](https://github.com/jwplayer/ott-web-app/commit/631f34285737ad4a63e9a70deb50e466aca89e96))
* combine metadata when sending personal details ([b1273ca](https://github.com/jwplayer/ott-web-app/commit/b1273ca894c5ce413ecb78bc67e7bc0a79cd7d6e))
* contain register logic in one service step ([2476a9d](https://github.com/jwplayer/ott-web-app/commit/2476a9dae1160a2f36e09c34899eb566cac820a1))
* crf checkbox support for 'on' and 'off' ([c0d9629](https://github.com/jwplayer/ott-web-app/commit/c0d9629ba2b7cdeaed506b33fa2d01d6bc9f117b))
* dynamic crf e2e coverage ([0b35179](https://github.com/jwplayer/ott-web-app/commit/0b35179cd564d3429e6215eb2059efdbad806be4))
* finally skip an e2e scenario ([98fafc3](https://github.com/jwplayer/ott-web-app/commit/98fafc3ee98f91dc71140759085fd491f235d1d1))
* fix last commit ([1a44e94](https://github.com/jwplayer/ott-web-app/commit/1a44e9441568d329642033132812f83101cd2ee3))
* fix updating from account section ([4fd8bf7](https://github.com/jwplayer/ott-web-app/commit/4fd8bf7d778e68ed75284796729c3dbf05bb047f))
* inplayer: send CRF metadata on register ([053da25](https://github.com/jwplayer/ott-web-app/commit/053da25cd06b6e8a3882bf6740c5b986b6c794f7))
* make terms field dynamic ([8931596](https://github.com/jwplayer/ott-web-app/commit/8931596f632fba3f08b607f0a6c0cb06dd909171))
* metadata consistency on register and update account ([39f19a9](https://github.com/jwplayer/ott-web-app/commit/39f19a928b5cb8929763b0496fca2fd2cbe02f26))
* re-add tryTo ([d4ba872](https://github.com/jwplayer/ott-web-app/commit/d4ba87283aa56cdae1728e210aa6921ba2d6cfa3))
* refactor last commit ([2f3e135](https://github.com/jwplayer/ott-web-app/commit/2f3e13586ad628dd4673849c16a31ade6499c19e))
* refactor last commit ([4236dc4](https://github.com/jwplayer/ott-web-app/commit/4236dc485106117d8a682ff9194cb92277f48784))
* refactor on code review feedback ([9b6fc6b](https://github.com/jwplayer/ott-web-app/commit/9b6fc6b837b479f9e1d300b8a3451e079b976780))
* remove tryTo in e2e tests ([cb52922](https://github.com/jwplayer/ott-web-app/commit/cb52922eb72f27703237dae7d65ffd5e0200b02f))
* removed codecept .only for a scenario ([960e068](https://github.com/jwplayer/ott-web-app/commit/960e068bb9b687b831f3ed67e7b8141877e21951))
* rename functions ([ad20660](https://github.com/jwplayer/ott-web-app/commit/ad2066043e38f3a27e1112222348c73a8815dc6b))
* revert accidental reftover in codecept.desktop.js ([3ae1007](https://github.com/jwplayer/ott-web-app/commit/3ae1007889709e66ad9c659f2ea1bb7d3e81e1b8))
* send crf metadata on update account ([26539ad](https://github.com/jwplayer/ott-web-app/commit/26539adab6c396301dfa472d3439aa29a58357fb))
* send metadata upon updating profile info ([0328c2d](https://github.com/jwplayer/ott-web-app/commit/0328c2dccb1dd192094183a1f4f1aa121a5bcab2))
* skip an e2e scenario ([1f774ac](https://github.com/jwplayer/ott-web-app/commit/1f774ac9bc59ff31d2a3ff55ce652fb4c26085a7))
* skip an e2e scenario ([c048e4a](https://github.com/jwplayer/ott-web-app/commit/c048e4a81f886fc43b6912651c808e703f2deaf7))
* update crf e2e scenario ([3574a16](https://github.com/jwplayer/ott-web-app/commit/3574a160f9bd7a71ec240eea51278530dc8ed46c))
* update snaps ([c8f9cd3](https://github.com/jwplayer/ott-web-app/commit/c8f9cd3cc884147a81604d2f73a67ce305aca1ae))
* **user:** password strength on reset ([#395](https://github.com/jwplayer/ott-web-app/issues/395)) ([e80e7a7](https://github.com/jwplayer/ott-web-app/commit/e80e7a7de4fc95a010f12e9f5f527d0bd7b2fd8f))

## [4.30.0](https://github.com/jwplayer/ott-web-app/compare/v4.28.0...v4.30.0) (2023-11-06)


Expand Down
10 changes: 10 additions & 0 deletions docs/content-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,13 @@ There are many examples in the included [content-types.json](scripts/content-typ
> Note: Although the upload file allows you to define reused fields and sections, when these are uploaded they become distinct copies for each instance in the schemas where they are used.
> That means that changing fields and sections via the api after they are uploaded must be done individually for each schema.
> Alternatively, you can re-upload and overwrite the existing schemas, but use caution because you will lose any other manual changes you have made.
# Content Type Data Structure

Content types do not change the underlying structure of data returned from the JWP delivery API. They are purely a convention on top of custom params to make the data entry on the JW dashboard easier and less error-prone. Custom params will still be returned as an array of string key-value pairs.

## Boolean custom params

Because custom params are always strings and any non-empty string in javascript converts to truthy, we have by convention decided on a few string values to consider striclty true or false. You can find these values in code: https://github.com/jwplayer/ott-web-app/blob/develop/src/utils/common.ts#L86

Be careful to use the right version considering the fallback when the value is not matched. For example, if you want the property to only be true when matched and fallback to false, use IsTruthy.
4 changes: 3 additions & 1 deletion docs/features/video-protection.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ Note that there are many variations of these access models.

### Free content

It's possible to have free content. This is indicated with media parameter `free` (`requiresSubscription` param is deprecated, accepted values are 'false', 'no' and '0'). As a possible value for `free` param you can use 'true', 'yes' (lower- or uppercase) or '1' number.
It's possible to have free content. This is indicated with media parameter `free`. As a possible value for `free` param you can use 'true', 'yes', 'on', or the number '1' as a string (also all case-insensitive).

> Note: The `requiresSubscription` param with accepted values of 'false', 'no', 'off', and '0' (all case-insensitive) is deprecated
### Users and entitlements

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jw-ott-webapp",
"version": "4.30.0",
"version": "4.31.0",
"main": "index.js",
"repository": "https://github.com/jwplayer/ott-web-app.git",
"author": "JW Player",
Expand Down Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@adyen/adyen-web": "^5.42.1",
"@codeceptjs/allure-legacy": "^1.0.2",
"@inplayer-org/inplayer.js": "^3.13.19",
"@inplayer-org/inplayer.js": "^3.13.21",
"classnames": "^2.3.1",
"date-fns": "^2.28.0",
"dompurify": "^2.3.8",
Expand Down
6 changes: 4 additions & 2 deletions public/locales/en/account.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"weak": "Weak"
},
"sign_up": "Sign up",
"terms_consent": "I accept the {{termsUrl}} of JW Player.",
"terms_and_conditions": "Terms and Conditions",
"user_exists": "There is already a user with this email address",
"view_password": "View password"
},
Expand All @@ -174,7 +174,8 @@
"hide_password": "Hide password",
"invalid_link": "Invalid link",
"invalid_password": "Invalid password",
"invalid_token": "The reset password link is invalid or has expired. Please try resetting your password again.",
"invalid_reset_link": "The reset password link is invalid or has expired. Please try resetting your password again.",
"invalid_token": "Invalid token. Check if you've entered the correct token that we emailed you or request a new one by restarting the forgot password process.",
"link_sent": "Password link sent",
"link_sent_text": "Please check your inbox at {{email}}",
"new_password": "New password",
Expand All @@ -185,6 +186,7 @@
"password_helper_text": "Use a minimum of 8 characters (case sensitive) with at least one number",
"password_reset": "Password reset",
"password_reset_text": "",
"password_strength": "Although your password meets the criteria for a strong password, it includes elements that are not advisable, such as prohibited phrases or repeated words. Please modify it to ensure account safety.",
"passwords_do_not_match": "Passwords do not match",
"repeat_new_password": "Repeat new password",
"reset_password": "Edit Password",
Expand Down
250 changes: 250 additions & 0 deletions public/locales/en/country.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
{
"af": "Afghanistan",
"ax": "Åland Islands",
"al": "Albania",
"dz": "Algeria",
"as": "American Samoa",
"ad": "Andorra",
"ao": "Angola",
"ai": "Anguilla",
"aq": "Antarctica",
"ag": "Antigua and Barbuda",
"ar": "Argentina",
"am": "Armenia",
"aw": "Aruba",
"au": "Australia",
"at": "Austria",
"az": "Azerbaijan",
"bs": "Bahamas",
"bh": "Bahrain",
"bd": "Bangladesh",
"bb": "Barbados",
"by": "Belarus",
"be": "Belgium",
"bz": "Belize",
"bj": "Benin",
"bm": "Bermuda",
"bt": "Bhutan",
"bo": "Bolivia",
"bq": "Bonaire, Sint Eustatius and Saba",
"ba": "Bosnia and Herzegovina",
"bw": "Botswana",
"bv": "Bouvet Island",
"br": "Brazil",
"io": "British Indian Ocean Territory",
"bn": "Brunei Darussalam",
"bg": "Bulgaria",
"bf": "Burkina Faso",
"bi": "Burundi",
"kh": "Cambodia",
"cm": "Cameroon",
"ca": "Canada",
"cv": "Cabo Verde",
"ky": "Cayman Islands",
"cf": "Central African Republic",
"td": "Chad",
"cl": "Chile",
"cn": "China",
"cx": "Christmas Island",
"cc": "Cocos (Keeling) Islands",
"co": "Colombia",
"km": "Comoros",
"cg": "Congo",
"cd": "Congo, The Democratic Republic of the",
"ck": "Cook Islands",
"cr": "Costa Rica",
"ci": "Cote D'Ivoire",
"hr": "Croatia",
"cu": "Cuba",
"cw": "Curaçao",
"cy": "Cyprus",
"cz": "Czech Republic",
"dk": "Denmark",
"dj": "Djibouti",
"dm": "Dominica",
"do": "Dominican Republic",
"ec": "Ecuador",
"eg": "Egypt",
"sv": "El Salvador",
"gq": "Equatorial Guinea",
"er": "Eritrea",
"ee": "Estonia",
"et": "Ethiopia",
"fk": "Falkland Islands (Malvinas)",
"fo": "Faroe Islands",
"fj": "Fiji",
"fi": "Finland",
"fr": "France",
"gf": "French Guiana",
"pf": "French Polynesia",
"tf": "French Southern Territories",
"ga": "Gabon",
"gm": "Gambia",
"ge": "Georgia",
"de": "Germany",
"gh": "Ghana",
"gi": "Gibraltar",
"gr": "Greece",
"gl": "Greenland",
"gd": "Grenada",
"gp": "Guadeloupe",
"gu": "Guam",
"gt": "Guatemala",
"gg": "Guernsey",
"gn": "Guinea",
"gw": "Guinea-Bissau",
"gy": "Guyana",
"ht": "Haiti",
"hm": "Heard Island and McDonald Islands",
"va": "Holy See (Vatican City State)",
"hn": "Honduras",
"hk": "Hong Kong",
"hu": "Hungary",
"is": "Iceland",
"in": "India",
"id": "Indonesia",
"ir": "Iran, Islamic Republic Of",
"iq": "Iraq",
"ie": "Ireland",
"im": "Isle of Man",
"il": "Israel",
"it": "Italy",
"jm": "Jamaica",
"jp": "Japan",
"je": "Jersey",
"jo": "Jordan",
"kz": "Kazakhstan",
"ke": "Kenya",
"ki": "Kiribati",
"kp": "Korea, Democratic People's Republic of",
"kr": "Korea, Republic of",
"kw": "Kuwait",
"kg": "Kyrgyzstan",
"la": "Lao People's Democratic Republic",
"lv": "Latvia",
"lb": "Lebanon",
"ls": "Lesotho",
"lr": "Liberia",
"ly": "Libya",
"li": "Liechtenstein",
"lt": "Lithuania",
"lu": "Luxembourg",
"mo": "Macao",
"mk": "Macedonia, The Former Yugoslav Republic of",
"mg": "Madagascar",
"mw": "Malawi",
"my": "Malaysia",
"mv": "Maldives",
"ml": "Mali",
"mt": "Malta",
"mh": "Marshall Islands",
"mq": "Martinique",
"mr": "Mauritania",
"mu": "Mauritius",
"yt": "Mayotte",
"mx": "Mexico",
"fm": "Micronesia, Federated States of",
"md": "Moldova, Republic of",
"mc": "Monaco",
"mn": "Mongolia",
"me": "Montenegro",
"ms": "Montserrat",
"ma": "Morocco",
"mz": "Mozambique",
"mm": "Myanmar",
"na": "Namibia",
"nr": "Nauru",
"np": "Nepal",
"nl": "Netherlands",
"nc": "New Caledonia",
"nz": "New Zealand",
"ni": "Nicaragua",
"ne": "Niger",
"ng": "Nigeria",
"nu": "Niue",
"nf": "Norfolk Island",
"mp": "Northern Mariana Islands",
"no": "Norway",
"om": "Oman",
"pk": "Pakistan",
"pw": "Palau",
"ps": "Palestine, State of",
"pa": "Panama",
"pg": "Papua New Guinea",
"py": "Paraguay",
"pe": "Peru",
"ph": "Philippines",
"pn": "Pitcairn",
"pl": "Poland",
"pt": "Portugal",
"pr": "Puerto Rico",
"qa": "Qatar",
"re": "Réunion",
"ro": "Romania",
"ru": "Russian Federation",
"rw": "Rwanda",
"bl": "Saint Barthélemy",
"sh": "Saint Helena, Ascension and Tristan da Cunha",
"kn": "Saint Kitts and Nevis",
"lc": "Saint Lucia",
"mf": "Saint Martin (French part)",
"pm": "Saint Pierre and Miquelon",
"vc": "Saint Vincent and the Grenadines",
"ws": "Samoa",
"sm": "San Marino",
"st": "Sao Tome and Principe",
"sa": "Saudi Arabia",
"sn": "Senegal",
"rs": "Serbia",
"sc": "Seychelles",
"sl": "Sierra Leone",
"sg": "Singapore",
"sx": "Sint Maarten (Dutch part)",
"sk": "Slovakia",
"si": "Slovenia",
"sb": "Solomon Islands",
"so": "Somalia",
"za": "South Africa",
"gs": "South Georgia and the South Sandwich Islands",
"es": "Spain",
"lk": "Sri Lanka",
"sd": "Sudan",
"sr": "Suriname",
"sj": "Svalbard and Jan Mayen",
"sz": "Swaziland",
"se": "Sweden",
"ch": "Switzerland",
"sy": "Syrian Arab Republic",
"tw": "Taiwan",
"tj": "Tajikistan",
"tz": "Tanzania, United Republic of",
"th": "Thailand",
"tl": "Timor-Leste",
"tg": "Togo",
"tk": "Tokelau",
"to": "Tonga",
"tt": "Trinidad and Tobago",
"tn": "Tunisia",
"tr": "Turkey",
"tm": "Turkmenistan",
"tc": "Turks and Caicos Islands",
"tv": "Tuvalu",
"ug": "Uganda",
"ua": "Ukraine",
"ae": "United Arab Emirates",
"gb": "United Kingdom",
"us": "United States of America",
"um": "United States Minor Outlying Islands",
"uy": "Uruguay",
"uz": "Uzbekistan",
"vu": "Vanuatu",
"ve": "Venezuela",
"vn": "Viet Nam",
"vg": "Virgin Islands, British",
"vi": "Virgin Islands, U.S.",
"wf": "Wallis and Futuna",
"eh": "Western Sahara",
"ye": "Yemen",
"zm": "Zambia",
"zw": "Zimbabwe"
}
Loading

0 comments on commit 3b47d03

Please sign in to comment.