From 2a97dc5bb43ff7a1d257406c86f4367d1ea4d465 Mon Sep 17 00:00:00 2001
From: Adam Rutkowski <hq@mtod.org>
Date: Sun, 30 Jun 2024 18:03:16 +0200
Subject: [PATCH] Modal no longer needs site

---
 .../js/dashboard/stats/modals/conversions.js  |  2 +-
 .../js/dashboard/stats/modals/entry-pages.js  |  2 +-
 .../js/dashboard/stats/modals/exit-pages.js   |  2 +-
 .../js/dashboard/stats/modals/filter-modal.js |  2 +-
 .../dashboard/stats/modals/google-keywords.js | 10 +++---
 assets/js/dashboard/stats/modals/pages.js     |  4 +--
 assets/js/dashboard/stats/modals/props.js     |  2 +-
 .../stats/modals/referrer-drilldown.js        | 32 +++++++++----------
 assets/js/dashboard/stats/modals/sources.js   |  2 +-
 assets/js/dashboard/stats/modals/table.js     |  2 +-
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/assets/js/dashboard/stats/modals/conversions.js b/assets/js/dashboard/stats/modals/conversions.js
index 69d648c74647..38efbfa7d032 100644
--- a/assets/js/dashboard/stats/modals/conversions.js
+++ b/assets/js/dashboard/stats/modals/conversions.js
@@ -117,7 +117,7 @@ function ConversionsModal(props) {
   }
 
   return (
-    <Modal site={site}>
+    <Modal>
       {renderBody()}
       {loading && renderLoading()}
       {!loading && moreResultsAvailable && renderLoadMore()}
diff --git a/assets/js/dashboard/stats/modals/entry-pages.js b/assets/js/dashboard/stats/modals/entry-pages.js
index 583151ef41e4..04007c6fd68c 100644
--- a/assets/js/dashboard/stats/modals/entry-pages.js
+++ b/assets/js/dashboard/stats/modals/entry-pages.js
@@ -147,7 +147,7 @@ class EntryPagesModal extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site}>
+      <Modal>
         {this.renderBody()}
         {this.renderLoading()}
       </Modal>
diff --git a/assets/js/dashboard/stats/modals/exit-pages.js b/assets/js/dashboard/stats/modals/exit-pages.js
index 828e136477ba..25be36b3ac23 100644
--- a/assets/js/dashboard/stats/modals/exit-pages.js
+++ b/assets/js/dashboard/stats/modals/exit-pages.js
@@ -124,7 +124,7 @@ class ExitPagesModal extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site}>
+      <Modal>
         {this.renderBody()}
         {this.renderLoading()}
       </Modal>
diff --git a/assets/js/dashboard/stats/modals/filter-modal.js b/assets/js/dashboard/stats/modals/filter-modal.js
index d529f9c4b9bf..8d3ccd175861 100644
--- a/assets/js/dashboard/stats/modals/filter-modal.js
+++ b/assets/js/dashboard/stats/modals/filter-modal.js
@@ -133,7 +133,7 @@ class FilterModal extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site} maxWidth="460px">
+      <Modal maxWidth="460px">
         <h1 className="text-xl font-bold dark:text-gray-100">Filter by {formatFilterGroup(this.state.modalType)}</h1>
 
         <div className="mt-4 border-b border-gray-300"></div>
diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.js
index 39ba7f3b8fca..4dfd45972679 100644
--- a/assets/js/dashboard/stats/modals/google-keywords.js
+++ b/assets/js/dashboard/stats/modals/google-keywords.js
@@ -4,7 +4,7 @@ import { Link, withRouter } from 'react-router-dom'
 import Modal from './modal'
 import * as api from '../../api'
 import numberFormatter, { percentageFormatter } from '../../util/number-formatter'
-import {parseQuery} from '../../query'
+import { parseQuery } from '../../query'
 import RocketIcon from './rocket-icon'
 
 class GoogleKeywordsModal extends React.Component {
@@ -17,7 +17,7 @@ class GoogleKeywordsModal extends React.Component {
   }
 
   componentDidMount() {
-    api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/Google`, this.state.query, {limit: 100})
+    api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/Google`, this.state.query, { limit: 100 })
       .then((res) => this.setState({
         loading: false,
         searchTerms: res.search_terms,
@@ -99,7 +99,7 @@ class GoogleKeywordsModal extends React.Component {
 
           <div className="my-4 border-b border-gray-300 dark:border-gray-500"></div>
           <main className="modal__content">
-            { this.renderKeywords() }
+            {this.renderKeywords()}
           </main>
         </React.Fragment>
       )
@@ -108,8 +108,8 @@ class GoogleKeywordsModal extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site} show={!this.state.loading}>
-        { this.renderBody() }
+      <Modal show={!this.state.loading}>
+        {this.renderBody()}
       </Modal>
     )
   }
diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js
index 303b30c51800..d564a2689c54 100644
--- a/assets/js/dashboard/stats/modals/pages.js
+++ b/assets/js/dashboard/stats/modals/pages.js
@@ -113,7 +113,7 @@ class PagesModal extends React.Component {
     if (this.state.pages) {
       return (
         <React.Fragment>
-          <h1 className="text-xl font-bold dark:text-gray-100">Top Pages</h1>
+          <h1 className="text-xl font-bold dark:text-gray-100">Top Pages hi</h1>
 
           <div className="my-4 border-b border-gray-300"></div>
           <main className="modal__content">
@@ -141,7 +141,7 @@ class PagesModal extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site}>
+      <Modal>
         {this.renderBody()}
         {this.renderLoading()}
       </Modal>
diff --git a/assets/js/dashboard/stats/modals/props.js b/assets/js/dashboard/stats/modals/props.js
index 6c46d68f11cf..64fe66a97b57 100644
--- a/assets/js/dashboard/stats/modals/props.js
+++ b/assets/js/dashboard/stats/modals/props.js
@@ -126,7 +126,7 @@ function PropsModal(props) {
   }
 
   return (
-    <Modal site={site}>
+    <Modal>
       {renderBody()}
       {loading && renderLoading()}
       {!loading && moreResultsAvailable && renderLoadMore()}
diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js
index 49d33c547690..ff1e4caf5bf2 100644
--- a/assets/js/dashboard/stats/modals/referrer-drilldown.js
+++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js
@@ -3,8 +3,8 @@ import { Link, withRouter } from 'react-router-dom'
 
 import Modal from './modal'
 import * as api from '../../api'
-import numberFormatter, {durationFormatter} from '../../util/number-formatter'
-import {parseQuery} from '../../query'
+import numberFormatter, { durationFormatter } from '../../util/number-formatter'
+import { parseQuery } from '../../query'
 import { updatedQuery } from "../../util/url";
 import { hasGoalFilter, replaceFilterByPrefix } from "../../util/filters";
 
@@ -20,8 +20,8 @@ class ReferrerDrilldownModal extends React.Component {
   componentDidMount() {
     const detailed = this.showExtra()
 
-    api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/${this.props.match.params.referrer}`, this.state.query, {limit: 100, detailed})
-      .then((response) => this.setState({loading: false, referrers: response.results}))
+    api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/referrers/${this.props.match.params.referrer}`, this.state.query, { limit: 100, detailed })
+      .then((response) => this.setState({ loading: false, referrers: response.results }))
   }
 
   showExtra() {
@@ -45,7 +45,7 @@ class ReferrerDrilldownModal extends React.Component {
   }
 
   formatBounceRate(ref) {
-    if (typeof(ref.bounce_rate) === 'number') {
+    if (typeof (ref.bounce_rate) === 'number') {
       return ref.bounce_rate + '%'
     } else {
       return '-'
@@ -53,7 +53,7 @@ class ReferrerDrilldownModal extends React.Component {
   }
 
   formatDuration(referrer) {
-    if (typeof(referrer.visit_duration) === 'number') {
+    if (typeof (referrer.visit_duration) === 'number') {
       return durationFormatter(referrer.visit_duration)
     } else {
       return '-'
@@ -77,12 +77,12 @@ class ReferrerDrilldownModal extends React.Component {
         <img src={`/favicon/sources/${referrer.name}`} referrerPolicy="no-referrer" className="h-4 w-4 mr-2 inline" />
         <Link
           className="block truncate hover:underline dark:text-gray-200"
-          to={{search: updatedQuery({ filters }), pathname: '/' + this.props.site.domain}}
+          to={{ search: updatedQuery({ filters }), pathname: '/' + this.props.site.domain }}
           title={referrer.name}
         >
           {referrer.name}
         </Link>
-        { this.renderExternalLink(referrer.name) }
+        {this.renderExternalLink(referrer.name)}
       </span>
     )
   }
@@ -91,13 +91,13 @@ class ReferrerDrilldownModal extends React.Component {
     return (
       <tr className="text-sm dark:text-gray-200" key={referrer.name}>
         <td className="p-2">
-          { this.renderReferrerName(referrer) }
+          {this.renderReferrerName(referrer)}
         </td>
-        {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{numberFormatter(referrer.total_visitors)}</td> }
+        {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{numberFormatter(referrer.total_visitors)}</td>}
         <td className="p-2 w-32 font-medium" align="right">{numberFormatter(referrer.visitors)}</td>
-        {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatBounceRate(referrer)}</td> }
-        {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatDuration(referrer)}</td> }
-        {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{referrer.conversion_rate}%</td> }
+        {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatBounceRate(referrer)}</td>}
+        {this.showExtra() && <td className="p-2 w-32 font-medium" align="right">{this.formatDuration(referrer)}</td>}
+        {this.showConversionRate() && <td className="p-2 w-32 font-medium" align="right">{referrer.conversion_rate}%</td>}
       </tr>
     )
   }
@@ -126,7 +126,7 @@ class ReferrerDrilldownModal extends React.Component {
                 </tr>
               </thead>
               <tbody>
-                { this.state.referrers.map(this.renderReferrer.bind(this)) }
+                {this.state.referrers.map(this.renderReferrer.bind(this))}
               </tbody>
             </table>
           </main>
@@ -137,8 +137,8 @@ class ReferrerDrilldownModal extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site}>
-        { this.renderBody() }
+      <Modal>
+        {this.renderBody()}
       </Modal>
     )
   }
diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.js
index 2f272f19e017..8e9efa068dc9 100644
--- a/assets/js/dashboard/stats/modals/sources.js
+++ b/assets/js/dashboard/stats/modals/sources.js
@@ -152,7 +152,7 @@ class SourcesModal extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site}>
+      <Modal>
         <h1 className="text-xl font-bold dark:text-gray-100">{this.title()}</h1>
 
         <div className="my-4 border-b border-gray-300 dark:border-gray-500"></div>
diff --git a/assets/js/dashboard/stats/modals/table.js b/assets/js/dashboard/stats/modals/table.js
index d5d319470ec3..fc4861776a10 100644
--- a/assets/js/dashboard/stats/modals/table.js
+++ b/assets/js/dashboard/stats/modals/table.js
@@ -110,7 +110,7 @@ class ModalTable extends React.Component {
 
   render() {
     return (
-      <Modal site={this.props.site} show={!this.state.loading}>
+      <Modal show={!this.state.loading}>
         {this.renderBody()}
       </Modal>
     )