Bug 1721072 - Move isSupportedPlatform to the store initialization ac…

…tion. r=canaltinova This means that we don't need to mount the ProfilerEventHandling component to get this piece of information. Differential Revision: https://phabricator.services.mozilla.com/D120154
dothq · Jul 22, 2021 · dfba4c5 · dfba4c5
1 parent cee8a05
commit dfba4c5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/devtools/client/performance-new/@types/perf.d.ts b/devtools/client/performance-new/@types/perf.d.ts
@@ -268,7 +268,6 @@ export type Action =
     }
   | {
       type: "REPORT_PROFILER_READY";
-      isSupportedPlatform: boolean;
       recordingState: RecordingState;
     }
   | {
@@ -295,6 +294,7 @@ export type Action =
   | {
       type: "INITIALIZE_STORE";
       perfFront: PerfFront;
+      isSupportedPlatform: boolean;
       setRecordingSettings: SetRecordingSettings;
       presets: Presets;
       pageContext: PageContext;
@@ -310,6 +310,7 @@ export type Action =
 
 export interface InitializeStoreValues {
   perfFront: PerfFront;
+  isSupportedPlatform: boolean;
   setRecordingSettings: SetRecordingSettings;
   presets: Presets;
   pageContext: PageContext;

diff --git a/devtools/client/performance-new/aboutprofiling/initializer.js b/devtools/client/performance-new/aboutprofiling/initializer.js
@@ -85,6 +85,7 @@ const {
  */
 async function gInit(perfFront, pageContext, openRemoteDevTools) {
   const store = createStore(reducers);
+  const isSupportedPlatform = await perfFront.isSupportedPlatform();
   const supportedFeatures = await perfFront.getSupportedFeatures();
 
   const l10n = new FluentL10n();
@@ -104,6 +105,7 @@ async function gInit(perfFront, pageContext, openRemoteDevTools) {
   store.dispatch(
     actions.initializeStore({
       perfFront,
+      isSupportedPlatform,
       supportedFeatures,
       presets,
       // Get the preferences from the current browser

diff --git a/devtools/client/performance-new/components/ProfilerEventHandling.js b/devtools/client/performance-new/components/ProfilerEventHandling.js
@@ -52,19 +52,14 @@ const selectors = require("devtools/client/performance-new/store/selectors");
  */
 class ProfilerEventHandling extends PureComponent {
   componentDidMount() {
-    const { perfFront, reportProfilerReady } = this.props;
+    const { perfFront, isSupportedPlatform, reportProfilerReady } = this.props;
 
     // Ask for the initial state of the profiler.
     Promise.all([
       perfFront.isActive(),
-      perfFront.isSupportedPlatform(),
       perfFront.isLockedForPrivateBrowsing(),
     ]).then(results => {
-      const [
-        isActive,
-        isSupportedPlatform,
-        isLockedForPrivateBrowsing,
-      ] = results;
+      const [isActive, isLockedForPrivateBrowsing] = results;
 
       let recordingState = this.props.recordingState;
       // It's theoretically possible we got an event that already let us know about
@@ -78,7 +73,7 @@ class ProfilerEventHandling extends PureComponent {
           recordingState = "available-to-record";
         }
       }
-      reportProfilerReady(isSupportedPlatform, recordingState);
+      reportProfilerReady(recordingState);
     });
 
     // Handle when the profiler changes state. It might be us, it might be someone else.

diff --git a/devtools/client/performance-new/initializer.js b/devtools/client/performance-new/initializer.js
@@ -88,6 +88,7 @@ const {
  */
 async function gInit(perfFront, pageContext, openAboutProfiling) {
   const store = createStore(reducers);
+  const isSupportedPlatform = await perfFront.isSupportedPlatform();
   const supportedFeatures = await perfFront.getSupportedFeatures();
 
   if (!openAboutProfiling) {
@@ -120,6 +121,7 @@ async function gInit(perfFront, pageContext, openAboutProfiling) {
   store.dispatch(
     actions.initializeStore({
       perfFront,
+      isSupportedPlatform,
       recordingSettings: getRecordingSettings(pageContext, supportedFeatures),
       presets,
       supportedFeatures,

diff --git a/devtools/client/performance-new/store/actions.js b/devtools/client/performance-new/store/actions.js
@@ -43,13 +43,11 @@ const changeRecordingState = (exports.changeRecordingState = (
 /**
  * This is the result of the initial questions about the state of the profiler.
  *
- * @param {boolean} isSupportedPlatform - This is a supported platform.
  * @param {RecordingState} recordingState - A valid state in `recordingState`.
  * @return {Action}
  */
-exports.reportProfilerReady = (isSupportedPlatform, recordingState) => ({
+exports.reportProfilerReady = recordingState => ({
   type: "REPORT_PROFILER_READY",
-  isSupportedPlatform,
   recordingState,
 });
 

diff --git a/devtools/client/performance-new/store/reducers.js b/devtools/client/performance-new/store/reducers.js
@@ -54,7 +54,7 @@ function recordingUnexpectedlyStopped(state = false, action) {
  */
 function isSupportedPlatform(state = null, action) {
   switch (action.type) {
-    case "REPORT_PROFILER_READY":
+    case "INITIALIZE_STORE":
       return action.isSupportedPlatform;
     default:
       return state;