@atlaskit/react-ufo 4.16.7 → 4.16.8

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.16.8
+
+### Patch Changes
+
+- [`4272868869ef8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4272868869ef8) -
+  Updated threshold for observations and keep SSR entry
+
 ## 4.16.7
 
 ### Patch Changes

package/dist/cjs/interaction-metrics/post-interaction-log.js

@@ -10,7 +10,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../config");
 var _hiddenTiming = require("../hidden-timing");
 var _vc = require("../vc");
@@ -129,7 +128,7 @@ var PostInteractionLog = exports.default = /*#__PURE__*/function () {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(!this.lastInteractionFinish || !this.sinkHandlerFn || !this.hasData() && !(0, _platformFeatureFlags.fg)('platform_ufo_always_send_post_interaction_log'))) {
+              if (!(!this.lastInteractionFinish || !this.sinkHandlerFn)) {
                 _context.next = 4;
                 break;
               }

package/dist/cjs/vc/vc-observer-new/raw-data-handler/index.js

@@ -19,7 +19,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ABORTING_WINDOW_EVENT = ['wheel', 'scroll', 'keydown', 'resize'];
-var MAX_OBSERVATIONS = 100;
+var MAX_OBSERVATIONS = 200;
 function isWindowEventEntryData(data) {
   return data.type === 'window:event' && 'eventType' in data;
 }
@@ -59,7 +59,7 @@ var RawDataHandler = exports.default = /*#__PURE__*/function () {
     key: "getRawData",
     value: function () {
       var _getRawData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
-        var entries, startTime, stopTime, isPageVisible, isVCClean, dirtyReason, getVCCleanStatusResult, viewportEntries, windowEventEntries, targetNameToIdMap, elementMapEntriesMap, nextElementId, typeMap, typeMapEntriesMap, nextTypeId, attributeMap, attributeEntriesMap, nextAttributeId, eventTypeMap, eventTypeMapEntriesMap, nextEventTypeId, rawObservations, rawEventObservations, firstObservation, lastObservations, referencedEids, referencedChgs, referencedAtts, _iterator, _step, observation, _iterator2, _step2, eid, _iterator3, _step3, chg, _iterator4, _step4, att, firstEventObservation, lastEventObservations, referencedEvts, _iterator5, _step5, _observation, _iterator6, _step6, evt, result;
+        var entries, startTime, stopTime, isPageVisible, isVCClean, dirtyReason, getVCCleanStatusResult, viewportEntries, windowEventEntries, targetNameToIdMap, elementMapEntriesMap, nextElementId, typeMap, typeMapEntriesMap, nextTypeId, attributeMap, attributeEntriesMap, nextAttributeId, eventTypeMap, eventTypeMapEntriesMap, nextEventTypeId, rawObservations, rawEventObservations, firstObservation, lastObservations, ssrEid, ssrObservation, ssrAlreadyIncluded, referencedEids, referencedChgs, referencedAtts, _iterator, _step, observation, _iterator2, _step2, eid, _iterator3, _step3, chg, _iterator4, _step4, att, firstEventObservation, lastEventObservations, referencedEvts, _iterator5, _step5, _observation, _iterator6, _step6, evt, result;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -157,12 +157,19 @@ var RawDataHandler = exports.default = /*#__PURE__*/function () {
                 };
                 return eventObservation;
               }); // If the number of observations is greater than the maximum allowed, we need to trim the observations to the maximum allowed.
-              // We do this by keeping the first observation and the last MAX_OBSERVATIONS observations.
+              // We do this by keeping the first observation, the SSR observation (if present), and the last MAX_OBSERVATIONS observations.
               // We then collect the referenced IDs from the remaining observations and remove the unreferenced entries from the maps
               if (rawObservations.length > MAX_OBSERVATIONS) {
                 firstObservation = rawObservations[0];
-                lastObservations = rawObservations.slice(-MAX_OBSERVATIONS);
-                rawObservations = [firstObservation].concat((0, _toConsumableArray2.default)(lastObservations));
+                lastObservations = rawObservations.slice(-MAX_OBSERVATIONS); // Find the SSR observation by looking up the eid that corresponds to 'SSR' element name
+                ssrEid = targetNameToIdMap.get('SSR');
+                ssrObservation = ssrEid ? rawObservations.find(function (obs) {
+                  return obs.eid === ssrEid && obs !== firstObservation;
+                }) : undefined; // Include SSR observation if it exists and is not already in the kept observations
+                ssrAlreadyIncluded = ssrObservation && lastObservations.some(function (obs) {
+                  return obs === ssrObservation;
+                });
+                rawObservations = [firstObservation].concat((0, _toConsumableArray2.default)(ssrObservation && !ssrAlreadyIncluded ? [ssrObservation] : []), (0, _toConsumableArray2.default)(lastObservations));
 
                 // Collect referenced IDs from remaining observations
                 referencedEids = new Set();

package/dist/es2019/interaction-metrics/post-interaction-log.js

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig } from '../config';
 import { getPageVisibilityState } from '../hidden-timing';
 import { VCObserverWrapper } from '../vc';
@@ -93,7 +92,7 @@ export default class PostInteractionLog {
    */
   async sendPostInteractionLog() {
     var _this$vcObserver4, _config$vc, _config$vc2, _this$vcObserver5;
-    if (!this.lastInteractionFinish || !this.sinkHandlerFn || !this.hasData() && !fg('platform_ufo_always_send_post_interaction_log')) {
+    if (!this.lastInteractionFinish || !this.sinkHandlerFn) {
       var _this$vcObserver3;
       this.reset();
       (_this$vcObserver3 = this.vcObserver) === null || _this$vcObserver3 === void 0 ? void 0 : _this$vcObserver3.stop();

package/dist/es2019/vc/vc-observer-new/raw-data-handler/index.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import getViewportHeight from '../metric-calculator/utils/get-viewport-height';
 import getViewportWidth from '../metric-calculator/utils/get-viewport-width';
 const ABORTING_WINDOW_EVENT = ['wheel', 'scroll', 'keydown', 'resize'];
-const MAX_OBSERVATIONS = 100;
+const MAX_OBSERVATIONS = 200;
 function isWindowEventEntryData(data) {
   return data.type === 'window:event' && 'eventType' in data;
 }
@@ -137,12 +137,19 @@ export default class RawDataHandler {
     });
 
     // If the number of observations is greater than the maximum allowed, we need to trim the observations to the maximum allowed.
-    // We do this by keeping the first observation and the last MAX_OBSERVATIONS observations.
+    // We do this by keeping the first observation, the SSR observation (if present), and the last MAX_OBSERVATIONS observations.
     // We then collect the referenced IDs from the remaining observations and remove the unreferenced entries from the maps
     if (rawObservations.length > MAX_OBSERVATIONS) {
       const firstObservation = rawObservations[0];
       const lastObservations = rawObservations.slice(-MAX_OBSERVATIONS);
-      rawObservations = [firstObservation, ...lastObservations];
+
+      // Find the SSR observation by looking up the eid that corresponds to 'SSR' element name
+      const ssrEid = targetNameToIdMap.get('SSR');
+      const ssrObservation = ssrEid ? rawObservations.find(obs => obs.eid === ssrEid && obs !== firstObservation) : undefined;
+
+      // Include SSR observation if it exists and is not already in the kept observations
+      const ssrAlreadyIncluded = ssrObservation && lastObservations.some(obs => obs === ssrObservation);
+      rawObservations = [firstObservation, ...(ssrObservation && !ssrAlreadyIncluded ? [ssrObservation] : []), ...lastObservations];
 
       // Collect referenced IDs from remaining observations
       const referencedEids = new Set();

package/dist/esm/interaction-metrics/post-interaction-log.js

@@ -5,7 +5,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig } from '../config';
 import { getPageVisibilityState } from '../hidden-timing';
 import { VCObserverWrapper } from '../vc';
@@ -122,7 +121,7 @@ var PostInteractionLog = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(!this.lastInteractionFinish || !this.sinkHandlerFn || !this.hasData() && !fg('platform_ufo_always_send_post_interaction_log'))) {
+              if (!(!this.lastInteractionFinish || !this.sinkHandlerFn)) {
                 _context.next = 4;
                 break;
               }

package/dist/esm/vc/vc-observer-new/raw-data-handler/index.js

@@ -12,7 +12,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import getViewportHeight from '../metric-calculator/utils/get-viewport-height';
 import getViewportWidth from '../metric-calculator/utils/get-viewport-width';
 var ABORTING_WINDOW_EVENT = ['wheel', 'scroll', 'keydown', 'resize'];
-var MAX_OBSERVATIONS = 100;
+var MAX_OBSERVATIONS = 200;
 function isWindowEventEntryData(data) {
   return data.type === 'window:event' && 'eventType' in data;
 }
@@ -52,7 +52,7 @@ var RawDataHandler = /*#__PURE__*/function () {
     key: "getRawData",
     value: function () {
       var _getRawData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
-        var entries, startTime, stopTime, isPageVisible, isVCClean, dirtyReason, getVCCleanStatusResult, viewportEntries, windowEventEntries, targetNameToIdMap, elementMapEntriesMap, nextElementId, typeMap, typeMapEntriesMap, nextTypeId, attributeMap, attributeEntriesMap, nextAttributeId, eventTypeMap, eventTypeMapEntriesMap, nextEventTypeId, rawObservations, rawEventObservations, firstObservation, lastObservations, referencedEids, referencedChgs, referencedAtts, _iterator, _step, observation, _iterator2, _step2, eid, _iterator3, _step3, chg, _iterator4, _step4, att, firstEventObservation, lastEventObservations, referencedEvts, _iterator5, _step5, _observation, _iterator6, _step6, evt, result;
+        var entries, startTime, stopTime, isPageVisible, isVCClean, dirtyReason, getVCCleanStatusResult, viewportEntries, windowEventEntries, targetNameToIdMap, elementMapEntriesMap, nextElementId, typeMap, typeMapEntriesMap, nextTypeId, attributeMap, attributeEntriesMap, nextAttributeId, eventTypeMap, eventTypeMapEntriesMap, nextEventTypeId, rawObservations, rawEventObservations, firstObservation, lastObservations, ssrEid, ssrObservation, ssrAlreadyIncluded, referencedEids, referencedChgs, referencedAtts, _iterator, _step, observation, _iterator2, _step2, eid, _iterator3, _step3, chg, _iterator4, _step4, att, firstEventObservation, lastEventObservations, referencedEvts, _iterator5, _step5, _observation, _iterator6, _step6, evt, result;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -150,12 +150,19 @@ var RawDataHandler = /*#__PURE__*/function () {
                 };
                 return eventObservation;
               }); // If the number of observations is greater than the maximum allowed, we need to trim the observations to the maximum allowed.
-              // We do this by keeping the first observation and the last MAX_OBSERVATIONS observations.
+              // We do this by keeping the first observation, the SSR observation (if present), and the last MAX_OBSERVATIONS observations.
               // We then collect the referenced IDs from the remaining observations and remove the unreferenced entries from the maps
               if (rawObservations.length > MAX_OBSERVATIONS) {
                 firstObservation = rawObservations[0];
-                lastObservations = rawObservations.slice(-MAX_OBSERVATIONS);
-                rawObservations = [firstObservation].concat(_toConsumableArray(lastObservations));
+                lastObservations = rawObservations.slice(-MAX_OBSERVATIONS); // Find the SSR observation by looking up the eid that corresponds to 'SSR' element name
+                ssrEid = targetNameToIdMap.get('SSR');
+                ssrObservation = ssrEid ? rawObservations.find(function (obs) {
+                  return obs.eid === ssrEid && obs !== firstObservation;
+                }) : undefined; // Include SSR observation if it exists and is not already in the kept observations
+                ssrAlreadyIncluded = ssrObservation && lastObservations.some(function (obs) {
+                  return obs === ssrObservation;
+                });
+                rawObservations = [firstObservation].concat(_toConsumableArray(ssrObservation && !ssrAlreadyIncluded ? [ssrObservation] : []), _toConsumableArray(lastObservations));
 
                 // Collect referenced IDs from remaining observations
                 referencedEids = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.16.7",
+	"version": "4.16.8",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -168,9 +168,6 @@
 		"platform_ufo_enable_finish_interaction_transition": {
 			"type": "boolean"
 		},
-		"platform_ufo_always_send_post_interaction_log": {
-			"type": "boolean"
-		},
 		"platform_ufo_drop_prior_fg_interactions": {
 			"type": "boolean"
 		},