@atlaskit/media-common 3.0.0 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/media-common
 
+## 4.0.0
+
+### Major Changes
+
+- [`b37723f2cfa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b37723f2cfa) - Removed unused method filterFeatureFlagKeysAllProducts
+  Added new method getFeatureFlagKeysAllProducts
+
+### Patch Changes
+
+- [`5859ee7d4e6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5859ee7d4e6) - Refactored code for better testing
+
 ## 3.0.0
 
 ### Major Changes

package/dist/cjs/analytics/withMediaAnalyticsContext.js

@@ -11,17 +11,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _MediaAnalyticsContext = require("@atlaskit/analytics-namespaced-context/MediaAnalyticsContext");
-var _mediaFeatureFlags = require("../mediaFeatureFlags");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var getFilteredFeatureFlags = function getFilteredFeatureFlags(keys, featureFlags) {
-  return keys.reduce(function (result, key) {
-    return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, key, (0, _mediaFeatureFlags.getMediaFeatureFlag)(key, featureFlags)));
-  }, {});
-};
-
 /**
  * HOC for attaching MediaAnalyticsContext to a top-level React Component.
  *
@@ -35,19 +28,16 @@ var getFilteredFeatureFlags = function getFilteredFeatureFlags(keys, featureFlag
  * @see packages/analytics/analytics-next/src/hocs/withAnalyticsContext.tsx
  */
 var withMediaAnalyticsContext = function withMediaAnalyticsContext(contextPublicAttributes) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return function (WrappedComponent) {
     // forwardRef() allows passing React refs to the wrapped component WithMediaAnalyticsContext
     var WithMediaAnalyticsContext = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       var featureFlags = props.featureFlags;
-      var filterFeatureFlags = options.filterFeatureFlags;
       var contextData = (0, _react.useMemo)(function () {
-        var filteredFlags = filterFeatureFlags && featureFlags ? getFilteredFeatureFlags(filterFeatureFlags, featureFlags) : featureFlags;
         var contextPrivateAttributes = {
-          featureFlags: filteredFlags
+          featureFlags: featureFlags
         };
         return _objectSpread(_objectSpread({}, contextPublicAttributes), {}, (0, _defineProperty2.default)({}, _MediaAnalyticsContext.MEDIA_CONTEXT, _objectSpread({}, contextPrivateAttributes)));
-      }, [filterFeatureFlags, featureFlags]);
+      }, [featureFlags]);
       return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
         data: contextData
       }, /*#__PURE__*/_react.default.createElement(WrappedComponent, (0, _extends2.default)({}, props, {

package/dist/cjs/index.js

@@ -33,16 +33,16 @@ Object.defineProperty(exports, "downloadUrl", {
     return _downloadUrl.downloadUrl;
   }
 });
-Object.defineProperty(exports, "filterFeatureFlagKeysAllProducts", {
+Object.defineProperty(exports, "filterFeatureFlagNames", {
   enumerable: true,
   get: function get() {
-    return _mediaFeatureFlags.filterFeatureFlagKeysAllProducts;
+    return _mediaFeatureFlags.filterFeatureFlagNames;
   }
 });
-Object.defineProperty(exports, "filterFeatureFlagNames", {
+Object.defineProperty(exports, "getFeatureFlagKeysAllProducts", {
   enumerable: true,
   get: function get() {
-    return _mediaFeatureFlags.filterFeatureFlagNames;
+    return _mediaFeatureFlags.getFeatureFlagKeysAllProducts;
   }
 });
 Object.defineProperty(exports, "getMediaFeatureFlag", {

package/dist/cjs/mediaFeatureFlags/genericFeatureFlag.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getGenericFeatureFlag = getGenericFeatureFlag;
+var _mediaFeatureFlagLocal = require("../mediaFeatureFlag-local");
+// Strongly typed method
+// Enforces consistency bewteen flagName, defaults & featureFlags parameters
+// All keys and value types need to match.
+// Examples (Uncomment to see results):
+// This works:
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: 'bye', key3: 4 });
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key3: 4 });
+// TS Error: key5 does not exist in default
+//    getGenericFeatureFlag('key5',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: 'bye', key3: 4 });
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key5: 'bye', key3: 4 });
+// TS Error: key2 values are inconsistent
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: true, key3: 4 });
+
+/**
+ * Returns the first value for the flagName found in this priority
+ *  1: local storage
+ *  2: featureFlags parameter
+ *  3: defaults parameter
+ */
+function getGenericFeatureFlag(flagName, defaults, featureFlags) {
+  var devOverride = (0, _mediaFeatureFlagLocal.getLocalMediaFeatureFlag)(flagName);
+  if (devOverride !== null) {
+    try {
+      return JSON.parse(devOverride);
+    } catch (e) {}
+  }
+  if (featureFlags) {
+    return flagName in featureFlags ? featureFlags[flagName] : defaults[flagName];
+  }
+  return defaults[flagName];
+}

package/dist/cjs/mediaFeatureFlags/index.js

@@ -15,16 +15,16 @@ Object.defineProperty(exports, "defaultMediaFeatureFlags", {
     return _mediaFeatureFlags.defaultMediaFeatureFlags;
   }
 });
-Object.defineProperty(exports, "filterFeatureFlagKeysAllProducts", {
+Object.defineProperty(exports, "filterFeatureFlagNames", {
   enumerable: true,
   get: function get() {
-    return _mediaFeatureFlags.filterFeatureFlagKeysAllProducts;
+    return _mediaFeatureFlags.filterFeatureFlagNames;
   }
 });
-Object.defineProperty(exports, "filterFeatureFlagNames", {
+Object.defineProperty(exports, "getFeatureFlagKeysAllProducts", {
   enumerable: true,
   get: function get() {
-    return _mediaFeatureFlags.filterFeatureFlagNames;
+    return _mediaFeatureFlags.getFeatureFlagKeysAllProducts;
   }
 });
 Object.defineProperty(exports, "getMediaFeatureFlag", {

package/dist/cjs/mediaFeatureFlags/mediaFeatureFlags.js

@@ -4,14 +4,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterFeatureFlagNames = exports.filterFeatureFlagKeysAllProducts = exports.defaultMediaFeatureFlags = exports.areEqualFeatureFlags = void 0;
+exports.getFeatureFlagKeysAllProducts = exports.filterFeatureFlagNames = exports.defaultMediaFeatureFlags = exports.areEqualFeatureFlags = void 0;
 exports.getMediaFeatureFlag = getMediaFeatureFlag;
-exports.useMemoizeFeatureFlags = exports.mapAndFilterFeatureFlagNames = void 0;
+exports.useMemoizeFeatureFlags = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _mediaFeatureFlagLocal = require("../mediaFeatureFlag-local");
 var _types = require("./types");
 var _productKeys = require("./productKeys");
+var _genericFeatureFlag = require("./genericFeatureFlag");
 var areEqualFeatureFlags = function areEqualFeatureFlags(ffA, ffB) {
   if (!ffA && !ffB) {
     return true;
@@ -48,31 +49,17 @@ var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {
   });
 };
 
-/**
- * Takes a record of {Media Feature Flag Names → boolean} and a supported product name.
- * Returns the corresponding product’s Launch Darkly Keys for each of the flags set as true in the input record.
- * */
-exports.filterFeatureFlagNames = filterFeatureFlagNames;
-var mapAndFilterFeatureFlagNames = function mapAndFilterFeatureFlagNames(flags, product) {
-  var mediaFeatureFlags = filterFeatureFlagNames(flags);
-  return mediaFeatureFlags.map(function (key) {
-    return (0, _productKeys.getProductKeys)()[product][key];
-  });
-};
-
 // TODO(MEX-1547): This is temporary solution to just return the launch darkly feature flags for all products.
 /**
  * Takes a record of {Media Feature Flag Names → boolean}.
  * Returns the Launch Darkly Keys from all products for each of the flags set as true in the input record.
  * */
-exports.mapAndFilterFeatureFlagNames = mapAndFilterFeatureFlagNames;
-var filterFeatureFlagKeysAllProducts = function filterFeatureFlagKeysAllProducts(flags) {
-  var filteredFlags = filterFeatureFlagNames(flags);
+exports.filterFeatureFlagNames = filterFeatureFlagNames;
+var getFeatureFlagKeysAllProducts = function getFeatureFlagKeysAllProducts() {
+  var productKeys = (0, _productKeys.getProductKeys)();
   var ldFeatureFlags = [];
-  filteredFlags.forEach(function (flag) {
-    return _types.supportedProducts.forEach(function (product) {
-      return ldFeatureFlags.push((0, _productKeys.getProductKeys)()[product][flag]);
-    });
+  _types.supportedProducts.forEach(function (product) {
+    ldFeatureFlags = [].concat((0, _toConsumableArray2.default)(ldFeatureFlags), (0, _toConsumableArray2.default)(Object.values(productKeys[product])));
   });
   return ldFeatureFlags.filter(function (flag) {
     return flag !== '';
@@ -90,7 +77,7 @@ var filterFeatureFlagKeysAllProducts = function filterFeatureFlagKeysAllProducts
  * If you must set a flag default = true, whenever you remove that flag
  * that change should be released as a MAJOR, because it's a breaking change.
  */
-exports.filterFeatureFlagKeysAllProducts = filterFeatureFlagKeysAllProducts;
+exports.getFeatureFlagKeysAllProducts = getFeatureFlagKeysAllProducts;
 var defaultMediaFeatureFlags = {
   newCardExperience: false,
   captions: false,
@@ -116,16 +103,7 @@ var defaultMediaFeatureFlags = {
  * */
 exports.defaultMediaFeatureFlags = defaultMediaFeatureFlags;
 function getMediaFeatureFlag(flagName, featureFlags) {
-  var devOverride = (0, _mediaFeatureFlagLocal.getLocalMediaFeatureFlag)(flagName);
-  if (devOverride !== null) {
-    try {
-      return JSON.parse(devOverride);
-    } catch (e) {}
-  }
-  if (featureFlags) {
-    return flagName in featureFlags ? featureFlags[flagName] : defaultMediaFeatureFlags[flagName];
-  }
-  return defaultMediaFeatureFlags[flagName];
+  return (0, _genericFeatureFlag.getGenericFeatureFlag)(flagName, defaultMediaFeatureFlags, featureFlags);
 }
 var useMemoizeFeatureFlags = function useMemoizeFeatureFlags(featureFlags) {
   var ref = (0, _react.useRef)();

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-common",
-	"version": "3.0.0",
+	"version": "4.0.0",
 	"sideEffects": false
 }

package/dist/es2019/analytics/withMediaAnalyticsContext.js

@@ -2,12 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { forwardRef, useMemo } from 'react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context/MediaAnalyticsContext';
-import { getMediaFeatureFlag } from '../mediaFeatureFlags';
-const getFilteredFeatureFlags = (keys, featureFlags) => keys.reduce((result, key) => ({
-  ...result,
-  [key]: getMediaFeatureFlag(key, featureFlags)
-}), {});
-
 /**
  * HOC for attaching MediaAnalyticsContext to a top-level React Component.
  *
@@ -20,19 +14,15 @@ const getFilteredFeatureFlags = (keys, featureFlags) => keys.reduce((result, key
  *
  * @see packages/analytics/analytics-next/src/hocs/withAnalyticsContext.tsx
  */
-export const withMediaAnalyticsContext = (contextPublicAttributes, options = {}) => WrappedComponent => {
+export const withMediaAnalyticsContext = contextPublicAttributes => WrappedComponent => {
   // forwardRef() allows passing React refs to the wrapped component WithMediaAnalyticsContext
   const WithMediaAnalyticsContext = /*#__PURE__*/forwardRef((props, ref) => {
     const {
       featureFlags
     } = props;
-    const {
-      filterFeatureFlags
-    } = options;
     const contextData = useMemo(() => {
-      const filteredFlags = filterFeatureFlags && featureFlags ? getFilteredFeatureFlags(filterFeatureFlags, featureFlags) : featureFlags;
       const contextPrivateAttributes = {
-        featureFlags: filteredFlags
+        featureFlags
       };
       return {
         ...contextPublicAttributes,
@@ -40,7 +30,7 @@ export const withMediaAnalyticsContext = (contextPublicAttributes, options = {})
           ...contextPrivateAttributes
         }
       };
-    }, [filterFeatureFlags, featureFlags]);
+    }, [featureFlags]);
     return /*#__PURE__*/React.createElement(AnalyticsContext, {
       data: contextData
     }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, {

package/dist/es2019/index.js

@@ -3,7 +3,7 @@ export { downloadUrl } from './downloadUrl';
 // See packages/media/media-core/src/__tests__/cache-backward-compatibility.spec.ts
 
 // Media Feature Flags
-export { getMediaFeatureFlag, defaultMediaFeatureFlags, areEqualFeatureFlags, useMemoizeFeatureFlags, filterFeatureFlagNames, filterFeatureFlagKeysAllProducts } from './mediaFeatureFlags';
+export { getMediaFeatureFlag, defaultMediaFeatureFlags, areEqualFeatureFlags, useMemoizeFeatureFlags, filterFeatureFlagNames, getFeatureFlagKeysAllProducts } from './mediaFeatureFlags';
 // Analytics context
 export { withMediaAnalyticsContext } from './analytics/withMediaAnalyticsContext';
 

package/dist/es2019/mediaFeatureFlags/genericFeatureFlag.js

@@ -0,0 +1,33 @@
+import { getLocalMediaFeatureFlag } from '../mediaFeatureFlag-local';
+
+// Strongly typed method
+// Enforces consistency bewteen flagName, defaults & featureFlags parameters
+// All keys and value types need to match.
+// Examples (Uncomment to see results):
+// This works:
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: 'bye', key3: 4 });
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key3: 4 });
+// TS Error: key5 does not exist in default
+//    getGenericFeatureFlag('key5',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: 'bye', key3: 4 });
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key5: 'bye', key3: 4 });
+// TS Error: key2 values are inconsistent
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: true, key3: 4 });
+
+/**
+ * Returns the first value for the flagName found in this priority
+ *  1: local storage
+ *  2: featureFlags parameter
+ *  3: defaults parameter
+ */
+export function getGenericFeatureFlag(flagName, defaults, featureFlags) {
+  const devOverride = getLocalMediaFeatureFlag(flagName);
+  if (devOverride !== null) {
+    try {
+      return JSON.parse(devOverride);
+    } catch (e) {}
+  }
+  if (featureFlags) {
+    return flagName in featureFlags ? featureFlags[flagName] : defaults[flagName];
+  }
+  return defaults[flagName];
+}

package/dist/es2019/mediaFeatureFlags/index.js

@@ -1 +1 @@
-export { getMediaFeatureFlag, useMemoizeFeatureFlags, defaultMediaFeatureFlags, areEqualFeatureFlags, filterFeatureFlagNames, filterFeatureFlagKeysAllProducts } from './mediaFeatureFlags';
+export { getMediaFeatureFlag, useMemoizeFeatureFlags, defaultMediaFeatureFlags, areEqualFeatureFlags, filterFeatureFlagNames, getFeatureFlagKeysAllProducts } from './mediaFeatureFlags';

package/dist/es2019/mediaFeatureFlags/mediaFeatureFlags.js

@@ -1,7 +1,7 @@
 import { useRef } from 'react';
-import { getLocalMediaFeatureFlag } from '../mediaFeatureFlag-local';
 import { supportedProducts } from './types';
 import { getProductKeys } from './productKeys';
+import { getGenericFeatureFlag } from './genericFeatureFlag';
 export const areEqualFeatureFlags = (ffA, ffB) => {
   if (!ffA && !ffB) {
     return true;
@@ -26,24 +26,17 @@ export const filterFeatureFlagNames = flags => {
   return pairs.filter(([_key, value]) => !!value).map(([key]) => key);
 };
 
-/**
- * Takes a record of {Media Feature Flag Names → boolean} and a supported product name.
- * Returns the corresponding product’s Launch Darkly Keys for each of the flags set as true in the input record.
- * */
-export const mapAndFilterFeatureFlagNames = (flags, product) => {
-  const mediaFeatureFlags = filterFeatureFlagNames(flags);
-  return mediaFeatureFlags.map(key => getProductKeys()[product][key]);
-};
-
 // TODO(MEX-1547): This is temporary solution to just return the launch darkly feature flags for all products.
 /**
  * Takes a record of {Media Feature Flag Names → boolean}.
  * Returns the Launch Darkly Keys from all products for each of the flags set as true in the input record.
  * */
-export const filterFeatureFlagKeysAllProducts = flags => {
-  const filteredFlags = filterFeatureFlagNames(flags);
-  const ldFeatureFlags = [];
-  filteredFlags.forEach(flag => supportedProducts.forEach(product => ldFeatureFlags.push(getProductKeys()[product][flag])));
+export const getFeatureFlagKeysAllProducts = () => {
+  const productKeys = getProductKeys();
+  let ldFeatureFlags = [];
+  supportedProducts.forEach(product => {
+    ldFeatureFlags = [...ldFeatureFlags, ...Object.values(productKeys[product])];
+  });
   return ldFeatureFlags.filter(flag => flag !== '');
 };
 
@@ -82,16 +75,7 @@ export const defaultMediaFeatureFlags = {
  * (you will see a warning in console if override used)
  * */
 export function getMediaFeatureFlag(flagName, featureFlags) {
-  const devOverride = getLocalMediaFeatureFlag(flagName);
-  if (devOverride !== null) {
-    try {
-      return JSON.parse(devOverride);
-    } catch (e) {}
-  }
-  if (featureFlags) {
-    return flagName in featureFlags ? featureFlags[flagName] : defaultMediaFeatureFlags[flagName];
-  }
-  return defaultMediaFeatureFlags[flagName];
+  return getGenericFeatureFlag(flagName, defaultMediaFeatureFlags, featureFlags);
 }
 export const useMemoizeFeatureFlags = featureFlags => {
   const ref = useRef();

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-common",
-	"version": "3.0.0",
+	"version": "4.0.0",
 	"sideEffects": false
 }

package/dist/esm/analytics/withMediaAnalyticsContext.js

@@ -5,13 +5,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React, { forwardRef, useMemo } from 'react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context/MediaAnalyticsContext';
-import { getMediaFeatureFlag } from '../mediaFeatureFlags';
-var getFilteredFeatureFlags = function getFilteredFeatureFlags(keys, featureFlags) {
-  return keys.reduce(function (result, key) {
-    return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, key, getMediaFeatureFlag(key, featureFlags)));
-  }, {});
-};
-
 /**
  * HOC for attaching MediaAnalyticsContext to a top-level React Component.
  *
@@ -25,19 +18,16 @@ var getFilteredFeatureFlags = function getFilteredFeatureFlags(keys, featureFlag
  * @see packages/analytics/analytics-next/src/hocs/withAnalyticsContext.tsx
  */
 export var withMediaAnalyticsContext = function withMediaAnalyticsContext(contextPublicAttributes) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return function (WrappedComponent) {
     // forwardRef() allows passing React refs to the wrapped component WithMediaAnalyticsContext
     var WithMediaAnalyticsContext = /*#__PURE__*/forwardRef(function (props, ref) {
       var featureFlags = props.featureFlags;
-      var filterFeatureFlags = options.filterFeatureFlags;
       var contextData = useMemo(function () {
-        var filteredFlags = filterFeatureFlags && featureFlags ? getFilteredFeatureFlags(filterFeatureFlags, featureFlags) : featureFlags;
         var contextPrivateAttributes = {
-          featureFlags: filteredFlags
+          featureFlags: featureFlags
         };
         return _objectSpread(_objectSpread({}, contextPublicAttributes), {}, _defineProperty({}, MEDIA_CONTEXT, _objectSpread({}, contextPrivateAttributes)));
-      }, [filterFeatureFlags, featureFlags]);
+      }, [featureFlags]);
       return /*#__PURE__*/React.createElement(AnalyticsContext, {
         data: contextData
       }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, {

package/dist/esm/index.js

@@ -3,7 +3,7 @@ export { downloadUrl } from './downloadUrl';
 // See packages/media/media-core/src/__tests__/cache-backward-compatibility.spec.ts
 
 // Media Feature Flags
-export { getMediaFeatureFlag, defaultMediaFeatureFlags, areEqualFeatureFlags, useMemoizeFeatureFlags, filterFeatureFlagNames, filterFeatureFlagKeysAllProducts } from './mediaFeatureFlags';
+export { getMediaFeatureFlag, defaultMediaFeatureFlags, areEqualFeatureFlags, useMemoizeFeatureFlags, filterFeatureFlagNames, getFeatureFlagKeysAllProducts } from './mediaFeatureFlags';
 // Analytics context
 export { withMediaAnalyticsContext } from './analytics/withMediaAnalyticsContext';
 

package/dist/esm/mediaFeatureFlags/genericFeatureFlag.js

@@ -0,0 +1,33 @@
+import { getLocalMediaFeatureFlag } from '../mediaFeatureFlag-local';
+
+// Strongly typed method
+// Enforces consistency bewteen flagName, defaults & featureFlags parameters
+// All keys and value types need to match.
+// Examples (Uncomment to see results):
+// This works:
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: 'bye', key3: 4 });
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key3: 4 });
+// TS Error: key5 does not exist in default
+//    getGenericFeatureFlag('key5',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: 'bye', key3: 4 });
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key5: 'bye', key3: 4 });
+// TS Error: key2 values are inconsistent
+//    getGenericFeatureFlag('key1',{ key1: true, key2: 'hiya', key3: 554 },{ key1: false, key2: true, key3: 4 });
+
+/**
+ * Returns the first value for the flagName found in this priority
+ *  1: local storage
+ *  2: featureFlags parameter
+ *  3: defaults parameter
+ */
+export function getGenericFeatureFlag(flagName, defaults, featureFlags) {
+  var devOverride = getLocalMediaFeatureFlag(flagName);
+  if (devOverride !== null) {
+    try {
+      return JSON.parse(devOverride);
+    } catch (e) {}
+  }
+  if (featureFlags) {
+    return flagName in featureFlags ? featureFlags[flagName] : defaults[flagName];
+  }
+  return defaults[flagName];
+}

package/dist/esm/mediaFeatureFlags/index.js

@@ -1 +1 @@
-export { getMediaFeatureFlag, useMemoizeFeatureFlags, defaultMediaFeatureFlags, areEqualFeatureFlags, filterFeatureFlagNames, filterFeatureFlagKeysAllProducts } from './mediaFeatureFlags';
+export { getMediaFeatureFlag, useMemoizeFeatureFlags, defaultMediaFeatureFlags, areEqualFeatureFlags, filterFeatureFlagNames, getFeatureFlagKeysAllProducts } from './mediaFeatureFlags';

package/dist/esm/mediaFeatureFlags/mediaFeatureFlags.js

@@ -1,8 +1,9 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { useRef } from 'react';
-import { getLocalMediaFeatureFlag } from '../mediaFeatureFlag-local';
 import { supportedProducts } from './types';
 import { getProductKeys } from './productKeys';
+import { getGenericFeatureFlag } from './genericFeatureFlag';
 export var areEqualFeatureFlags = function areEqualFeatureFlags(ffA, ffB) {
   if (!ffA && !ffB) {
     return true;
@@ -38,29 +39,16 @@ export var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {
   });
 };
 
-/**
- * Takes a record of {Media Feature Flag Names → boolean} and a supported product name.
- * Returns the corresponding product’s Launch Darkly Keys for each of the flags set as true in the input record.
- * */
-export var mapAndFilterFeatureFlagNames = function mapAndFilterFeatureFlagNames(flags, product) {
-  var mediaFeatureFlags = filterFeatureFlagNames(flags);
-  return mediaFeatureFlags.map(function (key) {
-    return getProductKeys()[product][key];
-  });
-};
-
 // TODO(MEX-1547): This is temporary solution to just return the launch darkly feature flags for all products.
 /**
  * Takes a record of {Media Feature Flag Names → boolean}.
  * Returns the Launch Darkly Keys from all products for each of the flags set as true in the input record.
  * */
-export var filterFeatureFlagKeysAllProducts = function filterFeatureFlagKeysAllProducts(flags) {
-  var filteredFlags = filterFeatureFlagNames(flags);
+export var getFeatureFlagKeysAllProducts = function getFeatureFlagKeysAllProducts() {
+  var productKeys = getProductKeys();
   var ldFeatureFlags = [];
-  filteredFlags.forEach(function (flag) {
-    return supportedProducts.forEach(function (product) {
-      return ldFeatureFlags.push(getProductKeys()[product][flag]);
-    });
+  supportedProducts.forEach(function (product) {
+    ldFeatureFlags = [].concat(_toConsumableArray(ldFeatureFlags), _toConsumableArray(Object.values(productKeys[product])));
   });
   return ldFeatureFlags.filter(function (flag) {
     return flag !== '';
@@ -102,16 +90,7 @@ export var defaultMediaFeatureFlags = {
  * (you will see a warning in console if override used)
  * */
 export function getMediaFeatureFlag(flagName, featureFlags) {
-  var devOverride = getLocalMediaFeatureFlag(flagName);
-  if (devOverride !== null) {
-    try {
-      return JSON.parse(devOverride);
-    } catch (e) {}
-  }
-  if (featureFlags) {
-    return flagName in featureFlags ? featureFlags[flagName] : defaultMediaFeatureFlags[flagName];
-  }
-  return defaultMediaFeatureFlags[flagName];
+  return getGenericFeatureFlag(flagName, defaultMediaFeatureFlags, featureFlags);
 }
 export var useMemoizeFeatureFlags = function useMemoizeFeatureFlags(featureFlags) {
   var ref = useRef();

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-common",
-	"version": "3.0.0",
+	"version": "4.0.0",
 	"sideEffects": false
 }

package/dist/types/analytics/withMediaAnalyticsContext.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { MediaFeatureFlags } from '../mediaFeatureFlags';
 import { ContextPublicAttributes } from './types';
 /**
  * HOC for attaching MediaAnalyticsContext to a top-level React Component.
@@ -13,6 +12,4 @@ import { ContextPublicAttributes } from './types';
  *
  * @see packages/analytics/analytics-next/src/hocs/withAnalyticsContext.tsx
  */
-export declare const withMediaAnalyticsContext: (contextPublicAttributes: ContextPublicAttributes, options?: {
-    filterFeatureFlags?: Array<keyof MediaFeatureFlags>;
-}) => <Props extends import("../mediaFeatureFlags").WithMediaFeatureFlags, Component extends React.ComponentType<Props>>(WrappedComponent: React.JSXElementConstructor<Props> & Component) => React.ForwardRefExoticComponent<React.PropsWithoutRef<JSX.LibraryManagedAttributes<Component, Props>> & React.RefAttributes<any>>;
+export declare const withMediaAnalyticsContext: (contextPublicAttributes: ContextPublicAttributes) => <Props extends import("..").WithMediaFeatureFlags, Component extends React.ComponentType<Props>>(WrappedComponent: React.JSXElementConstructor<Props> & Component) => React.ForwardRefExoticComponent<React.PropsWithoutRef<JSX.LibraryManagedAttributes<Component, Props>> & React.RefAttributes<any>>;

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 export { downloadUrl } from './downloadUrl';
 export declare type MediaType = 'doc' | 'audio' | 'video' | 'image' | 'archive' | 'unknown';
 export declare type FileStatus = 'uploading' | 'processing' | 'processed' | 'error' | 'failed-processing';
-export { getMediaFeatureFlag, defaultMediaFeatureFlags, areEqualFeatureFlags, useMemoizeFeatureFlags, filterFeatureFlagNames, filterFeatureFlagKeysAllProducts, } from './mediaFeatureFlags';
+export { getMediaFeatureFlag, defaultMediaFeatureFlags, areEqualFeatureFlags, useMemoizeFeatureFlags, filterFeatureFlagNames, getFeatureFlagKeysAllProducts, } from './mediaFeatureFlags';
 export type { MediaFeatureFlags, WithMediaFeatureFlags, } from './mediaFeatureFlags';
 export interface NumericalCardDimensions {
     width: number;

package/dist/types/mediaFeatureFlags/genericFeatureFlag.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Returns the first value for the flagName found in this priority
+ *  1: local storage
+ *  2: featureFlags parameter
+ *  3: defaults parameter
+ */
+export declare function getGenericFeatureFlag<T, K extends string, M extends Record<K, any>>(flagName: K, defaults: M, featureFlags?: Partial<M>): T;

package/dist/types/mediaFeatureFlags/index.d.ts

@@ -1,2 +1,2 @@
-export { getMediaFeatureFlag, useMemoizeFeatureFlags, defaultMediaFeatureFlags, areEqualFeatureFlags, filterFeatureFlagNames, filterFeatureFlagKeysAllProducts, } from './mediaFeatureFlags';
+export { getMediaFeatureFlag, useMemoizeFeatureFlags, defaultMediaFeatureFlags, areEqualFeatureFlags, filterFeatureFlagNames, getFeatureFlagKeysAllProducts, } from './mediaFeatureFlags';
 export type { MediaFeatureFlags, WithMediaFeatureFlags, SupportedProduct, } from './types';

package/dist/types/mediaFeatureFlags/mediaFeatureFlags.d.ts

@@ -1,16 +1,11 @@
-import { RequiredMediaFeatureFlags, MediaFeatureFlags, SupportedProduct } from './types';
+import { RequiredMediaFeatureFlags, MediaFeatureFlags } from './types';
 export declare const areEqualFeatureFlags: (ffA?: MediaFeatureFlags | undefined, ffB?: MediaFeatureFlags | undefined) => boolean;
 export declare const filterFeatureFlagNames: (flags: RequiredMediaFeatureFlags) => Array<keyof MediaFeatureFlags>;
-/**
- * Takes a record of {Media Feature Flag Names → boolean} and a supported product name.
- * Returns the corresponding product’s Launch Darkly Keys for each of the flags set as true in the input record.
- * */
-export declare const mapAndFilterFeatureFlagNames: (flags: RequiredMediaFeatureFlags, product: SupportedProduct) => Array<string>;
 /**
  * Takes a record of {Media Feature Flag Names → boolean}.
  * Returns the Launch Darkly Keys from all products for each of the flags set as true in the input record.
  * */
-export declare const filterFeatureFlagKeysAllProducts: (flags: RequiredMediaFeatureFlags) => Array<string>;
+export declare const getFeatureFlagKeysAllProducts: () => Array<string>;
 /**
  * defaultMediaFeatureFlags set default values used by the getter function getMediaFeatureFlag
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-common",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Includes common utilities used by other media packages",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@atlaskit/docs": "*",
-    "@atlaskit/media-test-helpers": "^30.1.0",
+    "@atlaskit/media-test-helpers": "^31.0.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "enzyme": "^3.10.0",
     "react": "^16.8.0",

package/report.api.md

@@ -91,16 +91,14 @@ export type FileStatus =
   | 'processing'
   | 'uploading';
 
-// @public
-export const filterFeatureFlagKeysAllProducts: (
-  flags: RequiredMediaFeatureFlags,
-) => Array<string>;
-
 // @public (undocumented)
 export const filterFeatureFlagNames: (
   flags: RequiredMediaFeatureFlags,
 ) => Array<keyof MediaFeatureFlags>;
 
+// @public
+export const getFeatureFlagKeysAllProducts: () => Array<string>;
+
 // @public
 export function getMediaFeatureFlag<T = boolean>(
   flagName: keyof MediaFeatureFlags,
@@ -331,9 +329,6 @@ export type WithFileAttributes = {
 // @public
 export const withMediaAnalyticsContext: (
   contextPublicAttributes: ContextPublicAttributes,
-  options?: {
-    filterFeatureFlags?: Array<keyof MediaFeatureFlags>;
-  },
 ) => <
   Props extends WithMediaFeatureFlags,
   Component extends React_2.ComponentType<Props>,