@times-components/user-state 0.4.30 → 0.5.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.5.0](https://github.com/newsuk/times-components/compare/@times-components/user-state@0.4.31...@times-components/user-state@0.5.0) (2023-08-10)
+
+
+### Features
+
+* **TMG-867:** updated conditions for registered user ([#3481](https://github.com/newsuk/times-components/issues/3481)) ([74866ba](https://github.com/newsuk/times-components/commit/74866ba07f8c1a03b7b88aef82591190f1ae8598))
+
+
+
+
+
+## [0.4.31](https://github.com/newsuk/times-components/compare/@times-components/user-state@0.4.30...@times-components/user-state@0.4.31) (2023-07-25)
+
+**Note:** Version bump only for package @times-components/user-state
+
+
+
+
+
 ## [0.4.30](https://github.com/newsuk/times-components/compare/@times-components/user-state@0.4.29...@times-components/user-state@0.4.30) (2023-07-25)
 
 **Note:** Version bump only for package @times-components/user-state

package/dist/matchers.js

@@ -23,13 +23,21 @@ var hasAccessLoggedInNonMeteredUser = function hasAccessLoggedInNonMeteredUser(u
 };
 
 var hasAccessLoggedInMeteredUser = function hasAccessLoggedInMeteredUser(userState) {
-  return hasAccessLoggedInUser(userState) && isMeteredUser(userState);
+  return hasAccessLoggedInUser(userState) && isMeteredUser(userState) && userState.isRegisteredUser;
+};
+
+var hasAccessRegisteredUser = function hasAccessRegisteredUser(userState) {
+  return hasAccessLoggedInOrSharedUser(userState) && !userState.isRegisteredUser;
+};
+
+var hasAccessLoggedInRegisteredUser = function hasAccessLoggedInRegisteredUser(userState) {
+  return hasAccessLoggedInNonMeteredUser(userState) && !userState.isRegisteredUser;
 };
 /* Entitlements */
 
 
 var showSaveAndShareBar = function showSaveAndShareBar(userState) {
-  return hasAccessLoggedInOrSharedUser(userState);
+  return hasAccessRegisteredUser(userState);
 };
 
 exports.showSaveAndShareBar = showSaveAndShareBar;
@@ -59,7 +67,7 @@ var showTokenisedEmailShare = function showTokenisedEmailShare(userState) {
 exports.showTokenisedEmailShare = showTokenisedEmailShare;
 
 var showCommentingModule = function showCommentingModule(userState) {
-  return hasAccessLoggedInNonMeteredUser(userState);
+  return hasAccessLoggedInRegisteredUser(userState);
 };
 
 exports.showCommentingModule = showCommentingModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@times-components/user-state",
-  "version": "0.4.30",
+  "version": "0.5.0",
   "description": "Selectively render react components based on current user state ",
   "main": "dist/user-state",
   "dev": "src/user-state",
@@ -32,15 +32,15 @@
   "homepage": "https://github.com/newsuk/times-components#readme",
   "dependencies": {
     "@storybook/addon-knobs": "6.4.0",
-    "@times-components/context": "1.10.27",
-    "@times-components/utils": "6.16.8",
+    "@times-components/context": "1.10.29",
+    "@times-components/utils": "6.16.10",
     "prop-types": "15.7.2"
   },
   "devDependencies": {
     "@babel/core": "7.4.4",
     "@times-components/eslint-config-thetimes": "0.8.18",
     "@times-components/jest-configurator-web": "0.8.1",
-    "@times-components/jest-serializer": "3.9.0",
+    "@times-components/jest-serializer": "3.9.1",
     "@times-components/webpack-configurator": "2.1.0",
     "babel-jest": "24.8.0",
     "babel-loader": "8.0.5",
@@ -63,5 +63,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "96b82e2149c7b7e631d94f235868d2247e59bf80"
+  "gitHead": "223ee6a28a72201c9d885bb4754b8e0c6883d429"
 }

package/rnw.js

@@ -1 +1 @@
-module.exports=function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=7)}([function(e,r){e.exports=require("react")},function(e,r){e.exports=require("@storybook/addon-knobs")},function(e,r){e.exports=require("prop-types")},function(e,r){e.exports=require("@times-components/context/rnw")},function(e,r){e.exports=require("@times-components/utils/rnw")},function(e,r){function t(e){var r=new Error("Cannot find module '"+e+"'");throw r.code="MODULE_NOT_FOUND",r}t.keys=function(){return[]},t.resolve=t,e.exports=t,t.id=5},function(e,r){e.exports=require("@times-components/user-state/rnw")},function(e,r,t){"use strict";t.r(r);var n=t(0),o=t.n(n),u=(t(2),t(3)),i=t.n(u),c=t(4);function s(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter((function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable}))),t.push.apply(t,n)}return t}function a(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?s(Object(t),!0).forEach((function(r){f(e,r,t[r])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):s(Object(t)).forEach((function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))}))}return e}function f(e,r,t){return r in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}var l=function(e){var r=e.children,t=e.serverRender,n=void 0===t||t;return o.a.createElement(i.a.Consumer,null,(function(e){var t=e.user;return o.a.createElement(c.ServerClientRender,{client:function(){var e=window.nuk,n=(void 0===e?{}:e).user||{};return r({user:a(a({},t),n)})},server:n?function(){return r({user:t})}:null})}))},d=function(e){return e.hasAccess&&(e.isLoggedIn||e.isShared)},b=function(e){return e.hasAccess&&e.isLoggedIn},p=function(e){return e.isMetered||e.isLightPackUser},v=function(e){return b(e)&&!p(e)};var O,g=function(){jest.mock("@times-components/user-state",(function(){var e=t(5).requireActual("@times-components/user-state").default;function r(e){var t=e.state,n=e.children,o=void 0===n?null:n,u=e.fallback,i=void 0===u?null:u;return r.mockStates.find((function(e){return e===t}))?o:i}return Object.keys(e).reduce((function(r,t){return r[t]=e[t],r}),r),r.mockReset=function(){r.mockStates=[e.showSaveAndShareBar,e.showArticleExtras,e.showTopicTags,e.showArticleSaveButton,e.showTokenisedEmailShare,e.showCommentingModule]},r.mockReset(),r}));var e=t(6);return beforeEach((function(){e.mockReset()})),e},m="Registered Access",w="Registered Access (Expired)",y={SUBSCRIBER:"Subscriber",RA:m,RA_EXPIRED:w,GUEST:"Guest"},h=t(1);function S(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter((function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable}))),t.push.apply(t,n)}return t}function j(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?S(Object(t),!0).forEach((function(r){P(e,r,t[r])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):S(Object(t)).forEach((function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))}))}return e}function P(e,r,t){return r in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}var k=(P(O={},"Subscriber",["isLoggedIn"]),P(O,m,["isLoggedIn","isMetered"]),P(O,w,["isLoggedIn","isMetered","isMeteredExpired"]),P(O,"Guest",[]),O),E=["Subscriber",m,w,"Guest"];var x=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"Subscriber";window.nuk=window.nuk||{},Object.defineProperty(window.nuk,"user",{enumerable:!0,configurable:!0,get:function(){var r=Object(h.select)("Current User State",E,e,"User State"),t=Object(h.boolean)("Is Shared",!1,"User State"),n=k[r].reduce((function(e,r){return j(j({},e),{},P({},r,!0))}),{});return j({isLoggedIn:!1,isMetered:!1,isMeteredExpired:!1,isShared:t},n)}})};function R(e){var r=e.state,t=e.children,n=e.fallback,u=e.serverRender;return o.a.createElement(l,{serverRender:u},(function(e){var o=e.user;return r(o)?t:n}))}t.d(r,"mockUserState",(function(){return g})),t.d(r,"USER_STATES",(function(){return y})),t.d(r,"addUserStateKnobs",(function(){return x})),R.showSaveAndShareBar=function(e){return d(e)},R.showArticleExtras=function(e){return d(e)},R.showTopicTags=function(e){return d(e)},R.showArticleSaveButton=function(e){return b(e)},R.showTokenisedEmailShare=function(e){return v(e)},R.showCommentingModule=function(e){return v(e)},R.showJoinTheConversationDialog=function(e){return function(e){return b(e)&&p(e)}(e)},R.defaultProps={children:null,serverRender:!0,fallback:null};r.default=R}]);
+module.exports=function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=7)}([function(e,r){e.exports=require("react")},function(e,r){e.exports=require("@storybook/addon-knobs")},function(e,r){e.exports=require("prop-types")},function(e,r){e.exports=require("@times-components/context/rnw")},function(e,r){e.exports=require("@times-components/utils/rnw")},function(e,r){function t(e){var r=new Error("Cannot find module '"+e+"'");throw r.code="MODULE_NOT_FOUND",r}t.keys=function(){return[]},t.resolve=t,e.exports=t,t.id=5},function(e,r){e.exports=require("@times-components/user-state/rnw")},function(e,r,t){"use strict";t.r(r);var n=t(0),o=t.n(n),u=(t(2),t(3)),i=t.n(u),c=t(4);function s(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter((function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable}))),t.push.apply(t,n)}return t}function a(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?s(Object(t),!0).forEach((function(r){f(e,r,t[r])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):s(Object(t)).forEach((function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))}))}return e}function f(e,r,t){return r in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}var l=function(e){var r=e.children,t=e.serverRender,n=void 0===t||t;return o.a.createElement(i.a.Consumer,null,(function(e){var t=e.user;return o.a.createElement(c.ServerClientRender,{client:function(){var e=window.nuk,n=(void 0===e?{}:e).user||{};return r({user:a(a({},t),n)})},server:n?function(){return r({user:t})}:null})}))},d=function(e){return e.hasAccess&&(e.isLoggedIn||e.isShared)},b=function(e){return e.hasAccess&&e.isLoggedIn},p=function(e){return e.isMetered||e.isLightPackUser},v=function(e){return b(e)&&!p(e)};var O,g=function(){jest.mock("@times-components/user-state",(function(){var e=t(5).requireActual("@times-components/user-state").default;function r(e){var t=e.state,n=e.children,o=void 0===n?null:n,u=e.fallback,i=void 0===u?null:u;return r.mockStates.find((function(e){return e===t}))?o:i}return Object.keys(e).reduce((function(r,t){return r[t]=e[t],r}),r),r.mockReset=function(){r.mockStates=[e.showSaveAndShareBar,e.showArticleExtras,e.showTopicTags,e.showArticleSaveButton,e.showTokenisedEmailShare,e.showCommentingModule]},r.mockReset(),r}));var e=t(6);return beforeEach((function(){e.mockReset()})),e},m="Registered Access",w="Registered Access (Expired)",y={SUBSCRIBER:"Subscriber",RA:m,RA_EXPIRED:w,GUEST:"Guest"},h=t(1);function S(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter((function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable}))),t.push.apply(t,n)}return t}function j(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{};r%2?S(Object(t),!0).forEach((function(r){P(e,r,t[r])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):S(Object(t)).forEach((function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r))}))}return e}function P(e,r,t){return r in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}var k=(P(O={},"Subscriber",["isLoggedIn"]),P(O,m,["isLoggedIn","isMetered"]),P(O,w,["isLoggedIn","isMetered","isMeteredExpired"]),P(O,"Guest",[]),O),E=["Subscriber",m,w,"Guest"];var x=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"Subscriber";window.nuk=window.nuk||{},Object.defineProperty(window.nuk,"user",{enumerable:!0,configurable:!0,get:function(){var r=Object(h.select)("Current User State",E,e,"User State"),t=Object(h.boolean)("Is Shared",!1,"User State"),n=k[r].reduce((function(e,r){return j(j({},e),{},P({},r,!0))}),{});return j({isLoggedIn:!1,isMetered:!1,isMeteredExpired:!1,isShared:t},n)}})};function R(e){var r=e.state,t=e.children,n=e.fallback,u=e.serverRender;return o.a.createElement(l,{serverRender:u},(function(e){var o=e.user;return r(o)?t:n}))}t.d(r,"mockUserState",(function(){return g})),t.d(r,"USER_STATES",(function(){return y})),t.d(r,"addUserStateKnobs",(function(){return x})),R.showSaveAndShareBar=function(e){return function(e){return d(e)&&!e.isRegisteredUser}(e)},R.showArticleExtras=function(e){return d(e)},R.showTopicTags=function(e){return d(e)},R.showArticleSaveButton=function(e){return b(e)},R.showTokenisedEmailShare=function(e){return v(e)},R.showCommentingModule=function(e){return function(e){return v(e)&&!e.isRegisteredUser}(e)},R.showJoinTheConversationDialog=function(e){return function(e){return b(e)&&p(e)&&e.isRegisteredUser}(e)},R.defaultProps={children:null,serverRender:!0,fallback:null};r.default=R}]);