@agderposten/organization-provider - npm Package Compare versions

Comparing version 1.2.0 to 2.0.0

dist/get-query.js

@@ -1,1 +0,1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=getQuery;require("core-js/modules/es6.regexp.split");var _iterateUpArray=_interopRequireDefault(require("@amphibian/iterate-up-array"));function getQuery(key,input){var queries=(input||"").split(/\?|&/);var match=(0,_iterateUpArray.default)(queries,function(query,i,end){var pair=(query||"").split("=");if(pair[0]===key){end(decodeURIComponent(pair[1]))}});return match||false}
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=getQuery;require("core-js/modules/es6.regexp.split.js");var _iterateUpArray=_interopRequireDefault(require("@amphibian/iterate-up-array"));function getQuery(key,input){var queries=(input||"").split(/\?|&/);var match=(0,_iterateUpArray.default)(queries,function(query,i,end){var pair=(query||"").split("=");if(pair[0]===key){end(decodeURIComponent(pair[1]))}});return match||false}

dist/index.js

@@ -1,1 +0,1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=organizationProvider;var _extends2=_interopRequireDefault(require("@babel/runtime/helpers/extends"));require("core-js/modules/es6.regexp.search");require("core-js/modules/es6.object.assign");require("core-js/modules/es6.regexp.split");var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));require("regenerator-runtime/runtime");var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _react=_interopRequireDefault(require("react"));var _isObject=_interopRequireDefault(require("@amphibian/is-object"));var _organizationFunctions=require("@agderposten/organization-functions");var _getQuery=_interopRequireDefault(require("./get-query"));function organizationProvider(){var options=null;var Component=null;var LoaderComponent=null;for(var _len=arguments.length,parameters=new Array(_len),_key=0;_key<_len;_key++){parameters[_key]=arguments[_key]}if((0,_isObject.default)(parameters[0])){options=parameters[0];Component=parameters[1];LoaderComponent=parameters[2]}else{Component=parameters[0];LoaderComponent=parameters[1]}var fetchOrganization=function(){var _ref2=(0,_asyncToGenerator2.default)(_regenerator.default.mark(function _callee(_ref){var environmentId,hostname;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:environmentId=_ref.environmentId,hostname=_ref.hostname;_context.prev=1;if(!environmentId){_context.next=8;break}_context.next=5;return(0,_organizationFunctions.fetchOrganizationByEnvironmentId)(environmentId);case 5:return _context.abrupt("return",_context.sent);case 8:if(!hostname){_context.next=12;break}_context.next=11;return(0,_organizationFunctions.fetchOrganizationByHostname)(hostname);case 11:return _context.abrupt("return",_context.sent);case 12:_context.next=17;break;case 14:_context.prev=14;_context.t0=_context["catch"](1);return _context.abrupt("return",{error:{code:_context.t0.code,message:_context.t0.message}});case 17:throw new Error("Missing environment ID or hostname");case 18:case"end":return _context.stop();}}},_callee,this,[[1,14]])}));return function fetchOrganization(_x){return _ref2.apply(this,arguments)}}();return function(_React$Component){(0,_inherits2.default)(OrganizationProvider,_React$Component);(0,_createClass2.default)(OrganizationProvider,null,[{key:"getInitialProps",value:function(){var _getInitialProps=(0,_asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(context){var props,hostnameQuery,host,hostname,organization;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:props={};hostnameQuery=context.req?(0,_getQuery.default)("__hostname__",context.req.url.split("?")[1]):(0,_getQuery.default)("__hostname__",window.location.href.split("?")[1]);host=context.req?context.req.headers["x-forwarded-host"]||context.req.headers.host:window.location.host;hostname=hostnameQuery||host.split(":")[0].split(".").slice(-2).join(".");_context2.next=6;return fetchOrganization(options||{hostname:hostname});case 6:organization=_context2.sent;if(!(Component&&Component.getInitialProps)){_context2.next=15;break}context.organization=organization;_context2.t0=Object;_context2.t1=props;_context2.next=13;return Component.getInitialProps(context);case 13:_context2.t2=_context2.sent;_context2.t0.assign.call(_context2.t0,_context2.t1,_context2.t2);case 15:Object.assign(props,{organization:organization});return _context2.abrupt("return",props);case 17:case"end":return _context2.stop();}}},_callee2,this)}));function getInitialProps(_x2){return _getInitialProps.apply(this,arguments)}return getInitialProps}()}]);function OrganizationProvider(props){var _this;(0,_classCallCheck2.default)(this,OrganizationProvider);_this=(0,_possibleConstructorReturn2.default)(this,(0,_getPrototypeOf2.default)(OrganizationProvider).call(this,props));_this.mounted=false;_this.state={isLoading:true,organization:null};return _this}(0,_createClass2.default)(OrganizationProvider,[{key:"componentDidMount",value:function componentDidMount(){this.mounted=true;this.initialize()}},{key:"componentWillUnmount",value:function componentWillUnmount(){this.mounted=false}},{key:"initialize",value:function(){var _initialize=(0,_asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(){var hostname,organization;return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:if(!this.props.organization){_context3.next=2;break}return _context3.abrupt("return");case 2:hostname=(0,_getQuery.default)("__hostname__",window.location.search)||window.location.hostname.split(".").slice(-2);_context3.next=5;return fetchOrganization(options||{hostname:hostname});case 5:organization=_context3.sent;if(this.mounted){this.setState({isLoading:false,organization:organization})}case 7:case"end":return _context3.stop();}}},_callee3,this)}));function initialize(){return _initialize.apply(this,arguments)}return initialize}()},{key:"render",value:function render(){if(this.props.organization){return _react.default.createElement(Component,this.props)}else if(this.state.isLoading){if(LoaderComponent){return _react.default.createElement(LoaderComponent,null)}return _react.default.createElement("div",null)}return _react.default.createElement(Component,(0,_extends2.default)({},this.props,{organization:this.state.organization}))}}]);return OrganizationProvider}(_react.default.Component)}
+"use strict";require("core-js/modules/es6.reflect.construct.js");var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=organizationProvider;require("core-js/modules/es6.regexp.search.js");require("core-js/modules/es6.array.slice.js");require("core-js/modules/es6.regexp.split.js");require("core-js/modules/es6.object.assign.js");var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _extends2=_interopRequireDefault(require("@babel/runtime/helpers/extends"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _react=_interopRequireDefault(require("react"));var _isObject=_interopRequireDefault(require("@amphibian/is-object"));var _organizationFunctions=require("@agderposten/organization-functions");var _getQuery=_interopRequireDefault(require("./get-query"));function _createSuper(Derived){var hasNativeReflectConstruct=_isNativeReflectConstruct();return function _createSuperInternal(){var Super=(0,_getPrototypeOf2.default)(Derived),result;if(hasNativeReflectConstruct){var NewTarget=(0,_getPrototypeOf2.default)(this).constructor;result=Reflect.construct(Super,arguments,NewTarget)}else{result=Super.apply(this,arguments)}return(0,_possibleConstructorReturn2.default)(this,result)}}function _isNativeReflectConstruct(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true}catch(e){return false}}function organizationProvider(){var options=null;var Component=null;var LoaderComponent=null;for(var _len=arguments.length,parameters=new Array(_len),_key=0;_key<_len;_key++){parameters[_key]=arguments[_key]}if((0,_isObject.default)(parameters[0])){options=parameters[0];Component=parameters[1];LoaderComponent=parameters[2]}else{Component=parameters[0];LoaderComponent=parameters[1]}var fetchOrganization=function(){var _ref2=(0,_asyncToGenerator2.default)(_regenerator.default.mark(function _callee(_ref){var environmentId,hostname;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:environmentId=_ref.environmentId,hostname=_ref.hostname;_context.prev=1;if(!environmentId){_context.next=8;break}_context.next=5;return(0,_organizationFunctions.fetchOrganizationByEnvironmentId)(environmentId);case 5:return _context.abrupt("return",_context.sent);case 8:if(!hostname){_context.next=12;break}_context.next=11;return(0,_organizationFunctions.fetchOrganizationByHostname)(hostname);case 11:return _context.abrupt("return",_context.sent);case 12:_context.next=17;break;case 14:_context.prev=14;_context.t0=_context["catch"](1);return _context.abrupt("return",{error:{code:_context.t0.code,message:_context.t0.message}});case 17:throw new Error("Missing environment ID or hostname");case 18:case"end":return _context.stop();}}},_callee,null,[[1,14]])}));return function fetchOrganization(_x){return _ref2.apply(this,arguments)}}();return function(_React$Component){(0,_inherits2.default)(OrganizationProvider,_React$Component);var _super=_createSuper(OrganizationProvider);function OrganizationProvider(props){var _this;(0,_classCallCheck2.default)(this,OrganizationProvider);_this=_super.call(this,props);_this.mounted=false;_this.state={isLoading:true,organization:null};return _this}(0,_createClass2.default)(OrganizationProvider,[{key:"componentDidMount",value:function componentDidMount(){this.mounted=true;this.initialize()}},{key:"componentWillUnmount",value:function componentWillUnmount(){this.mounted=false}},{key:"initialize",value:function(){var _initialize=(0,_asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(){var hostname,organization;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:if(!this.props.organization){_context2.next=2;break}return _context2.abrupt("return");case 2:hostname=(0,_getQuery.default)("__hostname__",window.location.search)||window.location.hostname.split(".").slice(-2);_context2.next=5;return fetchOrganization(options||{hostname:hostname});case 5:organization=_context2.sent;if(this.mounted){this.setState({isLoading:false,organization:organization})}case 7:case"end":return _context2.stop();}}},_callee2,this)}));function initialize(){return _initialize.apply(this,arguments)}return initialize}()},{key:"render",value:function render(){if(this.props.organization){return _react.default.createElement(Component,this.props)}else if(this.state.isLoading){if(LoaderComponent){return _react.default.createElement(LoaderComponent,null)}return _react.default.createElement("div",null)}return _react.default.createElement(Component,(0,_extends2.default)({},this.props,{organization:this.state.organization}))}}],[{key:"getInitialProps",value:function(){var _getInitialProps=(0,_asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(context){var props,hostnameQuery,host,hostname,organization;return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:props={};hostnameQuery=context.req?(0,_getQuery.default)("__hostname__",context.req.url.split("?")[1]):(0,_getQuery.default)("__hostname__",window.location.href.split("?")[1]);host=context.req?context.req.headers["x-forwarded-host"]||context.req.headers.host:window.location.host;hostname=hostnameQuery||host.split(":")[0].split(".").slice(-2).join(".");_context3.next=6;return fetchOrganization(options||{hostname:hostname});case 6:organization=_context3.sent;if(!(Component&&Component.getInitialProps)){_context3.next=15;break}context.organization=organization;_context3.t0=Object;_context3.t1=props;_context3.next=13;return Component.getInitialProps(context);case 13:_context3.t2=_context3.sent;_context3.t0.assign.call(_context3.t0,_context3.t1,_context3.t2);case 15:Object.assign(props,{organization:organization});return _context3.abrupt("return",props);case 17:case"end":return _context3.stop();}}},_callee3)}));function getInitialProps(_x2){return _getInitialProps.apply(this,arguments)}return getInitialProps}()}]);return OrganizationProvider}(_react.default.Component)}

package.json

 {
   "name": "@agderposten/organization-provider",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "main": "dist/index.js",
@@ -29,3 +29,3 @@ "config": {
   "dependencies": {
-    "@agderposten/organization-functions": "^1.2.8",
+    "@agderposten/organization-functions": "^2.0.0",
     "@amphibian/is-object": "^1.0.5",
@@ -32,0 +32,0 @@ "@amphibian/iterate-up-array": "^1.0.1"

No alert changes

Improved metrics

Total package byte prevSize

15792

increased by4.58%

Dependency changes

• + Added@agderposten/organization-functions@2.0.1(transitive)

• - Removed@agderposten/organization-functions@1.2.8(transitive)

• Updated@agderposten/organization-functions@^2.0.0