From 81c43ecc3d17e0dbf7ad1d949b6d977f2c65bd48 Mon Sep 17 00:00:00 2001
From: muhamedsalih-tw <104364298+muhamedsalih-tw@users.noreply.github.com>
Date: Thu, 27 Oct 2022 07:13:47 +0530
Subject: fix: 'failed prop' warning in QuickSwitchModal, SettingsNavigation,
 SettingsWindow and Recipe component tree (#713)

* chore: turn off eslint rule @typescript-eslint/no-useless-constructor to initialize dynamic props & state

Co-authored-by: Muhamed <>
Co-authored-by: Vijay A <vraravam@users.noreply.github.com>
---
 src/containers/settings/RecipesScreen.tsx  | 36 +++++++++++++++---------------
 src/containers/settings/SettingsWindow.tsx | 25 ++++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

(limited to 'src/containers')

diff --git a/src/containers/settings/RecipesScreen.tsx b/src/containers/settings/RecipesScreen.tsx
index fffdd39fa..abbb79b39 100644
--- a/src/containers/settings/RecipesScreen.tsx
+++ b/src/containers/settings/RecipesScreen.tsx
@@ -16,27 +16,30 @@ import RecipePreview from '../../models/RecipePreview';
 import { openPath } from '../../helpers/url-helpers';
 import withParams from '../../components/util/WithParams';
 
-interface RecipesScreenProps extends StoresProps {
+interface IProps extends Partial<StoresProps> {
   params: Params;
 }
 
-class RecipesScreen extends Component<RecipesScreenProps> {
-  state: {
-    needle: string | null;
-    currentFilter: string;
-  } = {
-    needle: null,
-    currentFilter: 'featured',
-  };
+interface IState {
+  needle: string | null;
+  currentFilter: string;
+}
 
+@inject('stores', 'actions')
+@observer
+class RecipesScreen extends Component<IProps, IState> {
   autorunDisposer: IReactionDisposer | null = null;
 
   customRecipes: Recipe[] = [];
 
-  constructor(props: RecipesScreenProps) {
+  constructor(props: IProps) {
     super(props);
 
     this.customRecipes = readJsonSync(asarRecipesPath('all.json'));
+    this.state = {
+      needle: null,
+      currentFilter: 'featured',
+    };
   }
 
   componentDidMount(): void {
@@ -55,7 +58,7 @@ class RecipesScreen extends Component<RecipesScreenProps> {
   }
 
   componentWillUnmount(): void {
-    this.props.stores.services.resetStatus();
+    this.props.stores!.services.resetStatus();
 
     if (typeof this.autorunDisposer === 'function') {
       this.autorunDisposer();
@@ -66,7 +69,7 @@ class RecipesScreen extends Component<RecipesScreenProps> {
     if (needle === '') {
       this.resetSearch();
     } else {
-      const { search } = this.props.actions.recipePreview;
+      const { search } = this.props.actions!.recipePreview;
       this.setState({ needle });
       search({ needle });
     }
@@ -106,10 +109,8 @@ class RecipesScreen extends Component<RecipesScreenProps> {
   }
 
   render(): ReactElement {
-    const { recipePreviews, recipes, services } = this.props.stores;
-
-    const { app: appActions, service: serviceActions } = this.props.actions;
-
+    const { recipePreviews, recipes, services } = this.props.stores!;
+    const { app: appActions, service: serviceActions } = this.props.actions!;
     const filter = this.state.currentFilter;
 
     let recipeFilter;
@@ -163,7 +164,6 @@ class RecipesScreen extends Component<RecipesScreenProps> {
           recipes={allRecipes}
           customWebsiteRecipe={customWebsiteRecipe}
           isLoading={isLoading}
-          addedServiceCount={services.all.length}
           hasLoadedRecipes={
             recipePreviews.featuredRecipePreviewsRequest.wasExecuted
           }
@@ -184,4 +184,4 @@ class RecipesScreen extends Component<RecipesScreenProps> {
   }
 }
 
-export default withParams(inject('stores', 'actions')(observer(RecipesScreen)));
+export default withParams(RecipesScreen);
diff --git a/src/containers/settings/SettingsWindow.tsx b/src/containers/settings/SettingsWindow.tsx
index 93bb08c7c..d2cdf3eb3 100644
--- a/src/containers/settings/SettingsWindow.tsx
+++ b/src/containers/settings/SettingsWindow.tsx
@@ -1,20 +1,23 @@
 import { inject, observer } from 'mobx-react';
-import { Component, ReactPortal } from 'react';
+import { Component, ReactElement, ReactPortal } from 'react';
 import ReactDOM from 'react-dom';
 import { Outlet } from 'react-router-dom';
-
 import { StoresProps } from '../../@types/ferdium-components.types';
 import Navigation from '../../components/settings/navigation/SettingsNavigation';
 import Layout from '../../components/settings/SettingsLayout';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { workspaceStore } from '../../features/workspaces';
 
-class SettingsContainer extends Component<StoresProps> {
-  portalRoot: any;
+interface IProps extends Partial<StoresProps> {}
+
+@inject('stores', 'actions')
+@observer
+class SettingsContainer extends Component<IProps> {
+  portalRoot: HTMLElement | null;
 
   el: HTMLDivElement;
 
-  constructor(props: StoresProps) {
+  constructor(props: IProps) {
     super(props);
 
     this.portalRoot = document.querySelector('#portalContainer');
@@ -22,7 +25,9 @@ class SettingsContainer extends Component<StoresProps> {
   }
 
   componentDidMount(): void {
-    this.portalRoot.append(this.el);
+    if (this.portalRoot) {
+      this.portalRoot.append(this.el);
+    }
   }
 
   componentWillUnmount(): void {
@@ -31,11 +36,11 @@ class SettingsContainer extends Component<StoresProps> {
 
   render(): ReactPortal {
     const { stores } = this.props;
-    const { closeSettings } = this.props.actions.ui;
+    const { closeSettings } = this.props.actions!.ui;
 
-    const navigation = (
+    const navigation: ReactElement = (
       <Navigation
-        serviceCount={stores.services.all.length}
+        serviceCount={stores!.services.all.length}
         workspaceCount={workspaceStore.workspaces.length}
       />
     );
@@ -51,4 +56,4 @@ class SettingsContainer extends Component<StoresProps> {
   }
 }
 
-export default inject('stores', 'actions')(observer(SettingsContainer));
+export default SettingsContainer;
-- 
cgit v1.2.3-54-g00ecf