makerspace-react-rails 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7340f6784a60e3787e4ddd7639745db83f3fd0a6047c69ce80c2a00c9a49ac35
-  data.tar.gz: 943bc8fede7f3989c2d8acb591b00a11cacb7814c07036c707efa46203b8a3a9
+  metadata.gz: 626a692e4a3f694cdc207597233bc43f2c317c560dcf3ee6eec56b7a347333a4
+  data.tar.gz: 3d49da274d7455c2be02dee25439740baf56567c83d20f178c3e37e69183d3f6
 SHA512:
-  metadata.gz: 333588b9102726ae3703ff7438954867548d2904cb2e142e2a3d8a2e65d546553f2e5213f268bdab6949346607ca2921fec7e56987feb33f084bb5b5b66f6620
-  data.tar.gz: a826c780fed2f0ea3797e0c5fc7202dc432c09eee84888cc73c287325854a10e8695dc0c3d28f1a3247068222823a76934a6c89926234db156224d0106c2cece
+  metadata.gz: '09fec8b43bf389297900c6c2d7d2c70578624e3791e0e4c7e19644a281f46f00c1d12ac431974389bf3775cdb554851085f28159eee19c15c10a38e1d67c817a'
+  data.tar.gz: 3dc5d52cb9c2d62cec2d381032abd5fbb69952e97d7084a529897f3a27ed00dace3fc0e62ad9517b152381d1680e2a9c5b07059fcb6731d75ab8bdcbafb62aa7

data/lib/makerspace/react/rails/version.rb

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.2.3"
+      VERSION = "0.2.4"
     end
   end
 end

data/vendor/assets/javascripts/makerspace-react.js

@@ -78206,16 +78206,10 @@ function baseClone(value, bitmask, customizer, key, object, stack) {
     value.forEach(function(subValue) {
       result.add(baseClone(subValue, bitmask, customizer, subValue, value, stack));
     });
-
-    return result;
-  }
-
-  if (Object(_isMap_js__WEBPACK_IMPORTED_MODULE_17__["default"])(value)) {
+  } else if (Object(_isMap_js__WEBPACK_IMPORTED_MODULE_17__["default"])(value)) {
     value.forEach(function(subValue, key) {
       result.set(key, baseClone(subValue, bitmask, customizer, key, value, stack));
     });
-
-    return result;
   }
 
   var keysFunc = isFull
@@ -80435,8 +80429,8 @@ function baseMerge(object, source, srcIndex, customizer, stack) {
     return;
   }
   Object(_baseFor_js__WEBPACK_IMPORTED_MODULE_2__["default"])(source, function(srcValue, key) {
+    stack || (stack = new _Stack_js__WEBPACK_IMPORTED_MODULE_0__["default"]);
     if (Object(_isObject_js__WEBPACK_IMPORTED_MODULE_4__["default"])(srcValue)) {
-      stack || (stack = new _Stack_js__WEBPACK_IMPORTED_MODULE_0__["default"]);
       Object(_baseMergeDeep_js__WEBPACK_IMPORTED_MODULE_3__["default"])(object, source, key, srcIndex, baseMerge, customizer, stack);
     }
     else {
@@ -84201,15 +84195,18 @@ function createRelationalOperation(operator) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _toInteger_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./toInteger.js */ "./node_modules/lodash-es/toInteger.js");
-/* harmony import */ var _toNumber_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./toNumber.js */ "./node_modules/lodash-es/toNumber.js");
-/* harmony import */ var _toString_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./toString.js */ "./node_modules/lodash-es/toString.js");
+/* harmony import */ var _root_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./_root.js */ "./node_modules/lodash-es/_root.js");
+/* harmony import */ var _toInteger_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./toInteger.js */ "./node_modules/lodash-es/toInteger.js");
+/* harmony import */ var _toNumber_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./toNumber.js */ "./node_modules/lodash-es/toNumber.js");
+/* harmony import */ var _toString_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./toString.js */ "./node_modules/lodash-es/toString.js");
+
 
 
 
 
 /* Built-in method references for those with the same name as other `lodash` methods. */
-var nativeMin = Math.min;
+var nativeIsFinite = _root_js__WEBPACK_IMPORTED_MODULE_0__["default"].isFinite,
+    nativeMin = Math.min;
 
 /**
  * Creates a function like `_.round`.
@@ -84221,15 +84218,15 @@ var nativeMin = Math.min;
 function createRound(methodName) {
   var func = Math[methodName];
   return function(number, precision) {
-    number = Object(_toNumber_js__WEBPACK_IMPORTED_MODULE_1__["default"])(number);
-    precision = precision == null ? 0 : nativeMin(Object(_toInteger_js__WEBPACK_IMPORTED_MODULE_0__["default"])(precision), 292);
-    if (precision) {
+    number = Object(_toNumber_js__WEBPACK_IMPORTED_MODULE_2__["default"])(number);
+    precision = precision == null ? 0 : nativeMin(Object(_toInteger_js__WEBPACK_IMPORTED_MODULE_1__["default"])(precision), 292);
+    if (precision && nativeIsFinite(number)) {
       // Shift with exponential notation to avoid floating-point issues.
       // See [MDN](https://mdn.io/round#Examples) for more details.
-      var pair = (Object(_toString_js__WEBPACK_IMPORTED_MODULE_2__["default"])(number) + 'e').split('e'),
+      var pair = (Object(_toString_js__WEBPACK_IMPORTED_MODULE_3__["default"])(number) + 'e').split('e'),
           value = func(pair[0] + 'e' + (+pair[1] + precision));
 
-      pair = (Object(_toString_js__WEBPACK_IMPORTED_MODULE_2__["default"])(value) + 'e').split('e');
+      pair = (Object(_toString_js__WEBPACK_IMPORTED_MODULE_3__["default"])(value) + 'e').split('e');
       return +(pair[0] + 'e' + (+pair[1] - precision));
     }
     return func(number);
@@ -87828,7 +87825,7 @@ var root = _freeGlobal_js__WEBPACK_IMPORTED_MODULE_0__["default"] || freeSelf ||
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /**
- * Gets the value at `key`, unless `key` is "__proto__".
+ * Gets the value at `key`, unless `key` is "__proto__" or "constructor".
  *
  * @private
  * @param {Object} object The object to query.
@@ -87836,6 +87833,10 @@ __webpack_require__.r(__webpack_exports__);
  * @returns {*} Returns the property value.
  */
 function safeGet(object, key) {
+  if (key === 'constructor' && typeof object[key] === 'function') {
+    return;
+  }
+
   if (key == '__proto__') {
     return;
   }
@@ -91684,6 +91685,7 @@ function debounce(func, wait, options) {
       }
       if (maxing) {
         // Handle invocations in a tight loop.
+        clearTimeout(timerId);
         timerId = setTimeout(timerExpired, wait);
         return invokeFunc(lastCallTime);
       }
@@ -98007,7 +98009,7 @@ __webpack_require__.r(__webpack_exports__);
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
  * Build: `lodash modularize exports="es" -o ./`
- * Copyright JS Foundation and other contributors <https://js.foundation/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
@@ -98050,7 +98052,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /** Used as the semantic version number. */
-var VERSION = '4.17.11';
+var VERSION = '4.17.14';
 
 /** Used to compose bitmasks for function metadata. */
 var WRAP_BIND_KEY_FLAG = 2;
@@ -98611,10 +98613,11 @@ Object(_arrayEach_js__WEBPACK_IMPORTED_MODULE_14__["default"])(['pop', 'push', '
 Object(_baseForOwn_js__WEBPACK_IMPORTED_MODULE_16__["default"])(_LazyWrapper_js__WEBPACK_IMPORTED_MODULE_11__["default"].prototype, function(func, methodName) {
   var lodashFunc = _wrapperLodash_js__WEBPACK_IMPORTED_MODULE_35__["default"][methodName];
   if (lodashFunc) {
-    var key = (lodashFunc.name + ''),
-        names = _realNames_js__WEBPACK_IMPORTED_MODULE_32__["default"][key] || (_realNames_js__WEBPACK_IMPORTED_MODULE_32__["default"][key] = []);
-
-    names.push({ 'name': methodName, 'func': lodashFunc });
+    var key = lodashFunc.name + '';
+    if (!hasOwnProperty.call(_realNames_js__WEBPACK_IMPORTED_MODULE_32__["default"], key)) {
+      _realNames_js__WEBPACK_IMPORTED_MODULE_32__["default"][key] = [];
+    }
+    _realNames_js__WEBPACK_IMPORTED_MODULE_32__["default"][key].push({ 'name': methodName, 'func': lodashFunc });
   }
 });
 
@@ -99623,7 +99626,7 @@ __webpack_require__.r(__webpack_exports__);
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
  * Build: `lodash modularize exports="es" -o ./`
- * Copyright JS Foundation and other contributors <https://js.foundation/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
@@ -106154,6 +106157,12 @@ var reNoMatch = /($^)/;
 /** Used to match unescaped characters in compiled string literals. */
 var reUnescapedString = /['\n\r\u2028\u2029\\]/g;
 
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
 /**
  * Creates a compiled template function that can interpolate data properties
  * in "interpolate" delimiters, HTML-escape interpolated data properties in
@@ -106289,7 +106298,14 @@ function template(string, options, guard) {
   , 'g');
 
   // Use a sourceURL for easier debugging.
-  var sourceURL = 'sourceURL' in options ? '//# sourceURL=' + options.sourceURL + '\n' : '';
+  // The sourceURL gets injected into the source that's eval-ed, so be careful
+  // with lookup (in case of e.g. prototype pollution), and strip newlines if any.
+  // A newline wouldn't be a valid sourceURL anyway, and it'd enable code injection.
+  var sourceURL = hasOwnProperty.call(options, 'sourceURL')
+    ? ('//# sourceURL=' +
+       (options.sourceURL + '').replace(/[\r\n]/g, ' ') +
+       '\n')
+    : '';
 
   string.replace(reDelimiters, function(match, escapeValue, interpolateValue, esTemplateValue, evaluateValue, offset) {
     interpolateValue || (interpolateValue = esTemplateValue);
@@ -106320,7 +106336,9 @@ function template(string, options, guard) {
 
   // If `variable` is not specified wrap a with-statement around the generated
   // code to add the data object to the top of the scope chain.
-  var variable = options.variable;
+  // Like with sourceURL, we take care to not check the option's prototype,
+  // as this configuration is a code injection vector.
+  var variable = hasOwnProperty.call(options, 'variable') && options.variable;
   if (!variable) {
     source = 'with (obj) {\n' + source + '\n}\n';
   }
@@ -203586,7 +203604,7 @@ var Receipt = /** @class */ (function (_super) {
                             React.createElement(TableCell_1.default, null,
                                 invoiceType,
                                 " expiration"),
-                            React.createElement(TableCell_1.default, null, invoice_1.isMemberInvoice(invoice) ? String(invoice.member.expirationTime) : invoice.rental.expiration)),
+                            React.createElement(TableCell_1.default, null, invoice_1.isMemberInvoice(invoice) ? utils_1.displayMemberExpiration(invoice.member) : invoice.rental.expiration)),
                         React.createElement(TableRow_1.default, null,
                             React.createElement(TableCell_1.default, null, "Description"),
                             React.createElement(TableCell_1.default, null, invoice.name)))),
@@ -207787,7 +207805,10 @@ var MemberDetail = /** @class */ (function (_super) {
         _this.openEditModal = function () { return _this.setState({ isEditOpen: true }); };
         _this.closeEditModal = function () { return _this.setState({ isEditOpen: false }); };
         _this.openCardModal = function () { return _this.setState({ isCardOpen: true }); };
-        _this.closeCardModal = function () { return _this.setState({ isCardOpen: false }); };
+        _this.closeCardModal = function () {
+            _this.props.getMember();
+            _this.setState({ isCardOpen: false });
+        };
         _this.renderMemberInfo = function () {
             var _a = _this.props, member = _a.member, billingEnabled = _a.billingEnabled;
             var details = constants_4.getDetailsForMember(member);
@@ -207884,13 +207905,14 @@ var MemberDetail = /** @class */ (function (_super) {
                     React.createElement(UpdateMemberContainer_1.default, { operation: constants_2.CrudOperation.Update, isOpen: isEditOpen, member: member, closeHandler: _this.closeEditModal, render: editForm }),
                     isCardOpen && React.createElement(AccessCardForm_1.default, { member: member, onClose: _this.closeCardModal })));
         };
-        var _a = _this.props, member = _a.member, currentUserId = _a.currentUserId;
-        var ownProfile = member && currentUserId === member.id;
-        _this.state = __assign({}, defaultState, { displayNotification: ownProfile && !member.memberContractOnFile ? NotificationModal_1.Notification.Welcome : undefined });
+        _this.state = __assign({}, defaultState);
         return _this;
     }
     MemberDetail.prototype.componentDidMount = function () {
-        this.props.getMember();
+        var _a = this.props, member = _a.member, currentUserId = _a.currentUserId, getMember = _a.getMember;
+        var ownProfile = member && currentUserId === member.id;
+        getMember();
+        this.setState(function (state) { return (__assign({}, state, { displayNotification: ownProfile && !member.memberContractOnFile ? NotificationModal_1.Notification.Welcome : undefined })); });
     };
     MemberDetail.prototype.componentDidUpdate = function (prevProps) {
         var oldMemberId = prevProps.match.params.memberId;
@@ -207906,9 +207928,7 @@ var MemberDetail = /** @class */ (function (_super) {
                 if (resource) {
                     !allowedResources.has(resource) && history.push(constants_2.Routing.Profile.replace(constants_2.Routing.PathPlaceholder.MemberId, currentUserId));
                 }
-                if (ownProfile && !member.memberContractOnFile) {
-                    this.setState({ displayNotification: NotificationModal_1.Notification.Welcome });
-                }
+                this.setState(function (state) { return (__assign({}, state, { displayNotification: ownProfile && !member.memberContractOnFile ? NotificationModal_1.Notification.Welcome : undefined })); });
                 if (member.earnedMembershipId && (ownProfile || admin)) {
                     this.props.getEarnedMembership(member.earnedMembershipId);
                 }