Merge remote-tracking branch 'origin/master' into 1746-rewrites

eoghan2t9 · Jun 1, 2020 · fb3ad25 · fb3ad25
2 parents a679498 + 67dacdf
commit fb3ad25
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 41 deletions.
diff --git a/client/public/assets/safari-pinned-tab.svg b/client/public/assets/safari-pinned-tab.svg
diff --git a/client/public/index.html b/client/public/index.html
@@ -7,7 +7,7 @@
         <meta name="google" content="notranslate">
         <meta http-equiv="x-dns-prefetch-control" content="off">
         <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
-        <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#5bbad5">
+        <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#67B279">
         <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
         <title>AdGuard Home</title>
     </head>

diff --git a/client/public/install.html b/client/public/install.html
@@ -6,7 +6,7 @@
         <meta name="theme-color" content="#000000">
         <meta name="google" content="notranslate">
         <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
-        <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#5bbad5">
+        <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#67B279">
         <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
         <title>Setup AdGuard Home</title>
     </head>

diff --git a/client/public/login.html b/client/public/login.html
@@ -6,7 +6,7 @@
         <meta name="theme-color" content="#000000">
         <meta name="google" content="notranslate">
         <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180x180.png" />
-        <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#5bbad5">
+        <link rel="mask-icon" href="assets/safari-pinned-tab.svg" color="#67B279">
         <link rel="icon" type="image/png" href="assets/favicon.png" sizes="48x48">
         <title>Login</title>
     </head>

diff --git a/client/src/components/Settings/FiltersConfig/Form.js b/client/src/components/Settings/FiltersConfig/Form.js
@@ -61,7 +61,6 @@ const Form = (props) => {
                         <label className="form__label">
                             <Trans>filters_interval</Trans>
                         </label>
-
                         {getIntervalSelect(processing, t, handleChange, toNumber)}
                     </div>
                 </div>

diff --git a/client/src/components/Settings/FiltersConfig/index.js b/client/src/components/Settings/FiltersConfig/index.js
@@ -1,33 +1,35 @@
-import React, { Component } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import debounce from 'lodash/debounce';
 
 import { DEBOUNCE_TIMEOUT } from '../../../helpers/constants';
 import Form from './Form';
+import { getObjDiff } from '../../../helpers/helpers';
 
-class FiltersConfig extends Component {
-    handleFormChange = debounce((values) => {
-        this.props.setFiltersConfig(values);
-    }, DEBOUNCE_TIMEOUT);
+const FiltersConfig = (props) => {
+    const { initialValues, processing } = props;
+
+    const handleFormChange = debounce((values) => {
+        const diff = getObjDiff(initialValues, values);
 
-    render() {
-        const { interval, enabled, processing } = this.props;
+        if (Object.values(diff).length > 0) {
+            props.setFiltersConfig(values);
+        }
+    }, DEBOUNCE_TIMEOUT);
 
-        return (
-            <Form
-                initialValues={{ interval, enabled }}
-                onSubmit={this.handleFormChange}
-                onChange={this.handleFormChange}
-                processing={processing}
-            />
-        );
-    }
-}
+    return (
+        <Form
+            initialValues={initialValues}
+            onSubmit={handleFormChange}
+            onChange={handleFormChange}
+            processing={processing}
+        />
+    );
+};
 
 FiltersConfig.propTypes = {
-    interval: PropTypes.number.isRequired,
-    enabled: PropTypes.bool.isRequired,
+    initialValues: PropTypes.object.isRequired,
     processing: PropTypes.bool.isRequired,
     setFiltersConfig: PropTypes.func.isRequired,
     t: PropTypes.func.isRequired,

diff --git a/client/src/components/Settings/index.js b/client/src/components/Settings/index.js
@@ -92,8 +92,10 @@ class Settings extends Component {
                                 <Card bodyType="card-body box-body--settings">
                                     <div className="form">
                                         <FiltersConfig
-                                            interval={filtering.interval}
-                                            enabled={filtering.enabled}
+                                            initialValues={{
+                                                interval: filtering.interval,
+                                                enabled: filtering.enabled,
+                                            }}
                                             processing={filtering.processingSetConfig}
                                             setFiltersConfig={setFiltersConfig}
                                         />

diff --git a/client/src/helpers/helpers.js b/client/src/helpers/helpers.js
@@ -482,6 +482,19 @@ export const getCurrentFilter = (url, filters) => {
     };
 };
 
+/**
+ * @param {object} initialValues
+ * @param {object} values
+ * @returns {object} Returns different values of objects
+ */
+export const getObjDiff = (initialValues, values) => Object.entries(values)
+    .reduce((acc, [key, value]) => {
+        if (value !== initialValues[key]) {
+            acc[key] = value;
+        }
+        return acc;
+    }, {});
+
 /**
  * @param number Number to format
  * @returns string Returns a string with a language-sensitive representation of this number

diff --git a/client/src/reducers/rewrites.js b/client/src/reducers/rewrites.js
@@ -20,7 +20,7 @@ const rewrites = handleActions(
         [actions.addRewriteSuccess]: (state, { payload }) => {
             const newState = {
                 ...state,
-                list: [...state.list, ...payload],
+                list: [...state.list, payload],
                 processingAdd: false,
             };
             return newState;