fix(settings): removes api_filters from settings

fixes #88
wp-pwa · Jan 22, 2019 · b42942a · b42942a
1 parent 60d58b1
commit b42942a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 48 deletions.
diff --git a/admin/components/Settings/index.js b/admin/components/Settings/index.js
@@ -21,15 +21,13 @@ const Settings = ({
   frontpageForced,
   htmlPurifierActive,
   excludes,
-  apiFilters,
   setSiteId,
   setSsrServer,
   setStaticServer,
   setAmpServer,
   setFrontpageForced,
   setHtmlPurifierActive,
   setExcludes,
-  setApiFilters,
   saveSettings,
   purgeHtmlPurifierCache,
   notification,
@@ -41,7 +39,6 @@ const Settings = ({
   fieldForceFrontpage,
   fieldHtmlPurifier,
   fieldExcludes,
-  fieldApiFilters,
   saveButtonText,
   siteIdValidation,
   ssrServerValidation,
@@ -152,13 +149,6 @@ const Settings = ({
               onChange={setExcludes}
             />
           </FormField>
-          <FormField label={fieldApiFilters.label}>
-            <TextArea
-              placeholder={fieldApiFilters.placeholder}
-              value={apiFilters}
-              onChange={setApiFilters}
-            />
-          </FormField>
         </form>
       </Form>
     </Options>
@@ -181,15 +171,13 @@ Settings.propTypes = {
   frontpageForced: bool.isRequired,
   htmlPurifierActive: bool.isRequired,
   excludes: string.isRequired,
-  apiFilters: string.isRequired,
   setSiteId: func.isRequired,
   setSsrServer: func.isRequired,
   setStaticServer: func.isRequired,
   setAmpServer: func.isRequired,
   setFrontpageForced: func.isRequired,
   setHtmlPurifierActive: func.isRequired,
   setExcludes: func.isRequired,
-  setApiFilters: func.isRequired,
   saveSettings: func.isRequired,
   purgeHtmlPurifierCache: func.isRequired,
   notification: shape({ highlight: string, content: string }).isRequired,
@@ -204,7 +192,6 @@ Settings.propTypes = {
     button: shape({ idle: string, busy: string, done: string }),
   }).isRequired,
   fieldExcludes: shape({ label: string, placeholder: string }).isRequired,
-  fieldApiFilters: shape({ label: string, placeholder: string }).isRequired,
   saveButtonText: shape({ idle: string, busy: string, done: string })
     .isRequired,
   siteIdValidation: string,
@@ -234,15 +221,13 @@ export default inject(
       frontpageForced: settings.frontpage_forced,
       htmlPurifierActive: settings.html_purifier_active,
       excludes: settings.excludes.join("\n"),
-      apiFilters: settings.api_filters.join("\n"),
       setSiteId: settings.setSiteId,
       setSsrServer: settings.setSsrServer,
       setStaticServer: settings.setStaticServer,
       setAmpServer: settings.setAmpServer,
       setFrontpageForced: settings.setFrontpageForced,
       setHtmlPurifierActive: settings.setHtmlPurifierActive,
       setExcludes: settings.setExcludes,
-      setApiFilters: settings.setApiFilters,
       saveSettings: settings.saveSettings,
       purgeHtmlPurifierCache: settings.purgeHtmlPurifierCache,
       siteIdValidation: validations.settings.site_id,
@@ -260,7 +245,6 @@ export default inject(
       fieldForceFrontpage: languages.get(`${form}.fieldForceFrontpage`),
       fieldHtmlPurifier: languages.get(`${form}.fieldHtmlPurifier`),
       fieldExcludes: languages.get(`${form}.fieldExcludes`),
-      fieldApiFilters: languages.get(`${form}.fieldApiFilters`),
       saveButtonText: languages.get("settings.saveButton"),
     };
   }

diff --git a/admin/languages/en_US.json b/admin/languages/en_US.json
@@ -154,10 +154,6 @@
       "fieldExcludes": {
         "label": "Exclude URLs in the PWA",
         "placeholder": "http://sample.com/page/\nhttp://v2.sample.com/page/"
-      },
-      "fieldApiFilters": {
-        "label": "Filter WP API fields",
-        "placeholder": "_links\ntitle.rendered"
       }
     },
     "saveButton": {

diff --git a/admin/models/__tests__/settings.tests.js b/admin/models/__tests__/settings.tests.js
@@ -25,7 +25,6 @@ describe("Admin › Models › Settings", () => {
     expect(store.frontpage_forced).toBe(false);
     expect(store.html_purifier_active).toBe(true);
     expect(store.excludes).toEqual([]);
-    expect(store.api_filters).toEqual([]);
   });
 
   test("`general` should return the right value", () => {
@@ -211,17 +210,6 @@ describe("Admin › Models › Settings", () => {
     expect(store.excludes).toEqual(["something", "something else"]);
   });
 
-  test("`setApiFilters` should set a value for `api_filters`", () => {
-    const store = Store.create();
-
-    store.setApiFilters({
-      target: {
-        value: "something\nsomething else",
-      },
-    });
-    expect(store.api_filters).toEqual(["something", "something else"]);
-  });
-
   test("`setSiteIdRequested` should set a value for `site_id_requested`, clear the validation of `site_id` and call `saveSettings()`", () => {
     const store = Store.create();
     const saveSettings = jest.fn();
@@ -261,7 +249,6 @@ describe("Admin › Models › Settings", () => {
       static_server: "   https://static.wp-pwa.com   ",
       amp_server: "   https://amp.wp-pwa.com   ",
       excludes: ["   ", "   something   ", "   something else   "],
-      api_filters: ["   ", "   something   ", "   something else   "],
     });
 
     await store.trimTextFields();
@@ -270,7 +257,6 @@ describe("Admin › Models › Settings", () => {
     expect(store.static_server).toBe("https://static.wp-pwa.com");
     expect(store.amp_server).toBe("https://amp.wp-pwa.com");
     expect(store.excludes).toEqual(["something", "something else"]);
-    expect(store.api_filters).toEqual(["something", "something else"]);
   });
 
   test("`saveSettings` should call `trimTextFields()`, send a request to save the settings and update `saveButtonStatus`", async () => {
@@ -330,7 +316,6 @@ describe("Admin › Models › Settings", () => {
           frontpage_forced: false,
           html_purifier_active: true,
           excludes: [],
-          api_filters: [],
         },
       },
     };
@@ -346,7 +331,6 @@ describe("Admin › Models › Settings", () => {
       frontpage_forced: false,
       html_purifier_active: true,
       excludes: [],
-      api_filters: [],
     };
 
     const data = new window.FormData();
@@ -384,7 +368,6 @@ describe("Admin › Models › Settings", () => {
           frontpage_forced: false,
           html_purifier_active: true,
           excludes: [],
-          api_filters: [],
         },
       },
     };

diff --git a/admin/models/settings.js b/admin/models/settings.js
@@ -13,7 +13,6 @@ export default types
     frontpage_forced: false,
     html_purifier_active: true,
     excludes: types.array(types.string),
-    api_filters: types.array(types.string),
   })
   .views(self => ({
     get root() {
@@ -61,9 +60,6 @@ export default types
     setExcludes({ target }) {
       self.excludes = target.value.split("\n");
     },
-    setApiFilters({ target }) {
-      self.api_filters = target.value.split("\n");
-    },
     setSiteIdRequested(value) {
       self.site_id_requested = value;
       self.saveSettings();
@@ -77,9 +73,6 @@ export default types
       self.excludes = self.excludes
         .map(exclude => exclude.trim())
         .filter(exclude => exclude);
-      self.api_filters = self.api_filters
-        .map(filter => filter.trim())
-        .filter(filter => filter);
     },
     async saveSettings(event) {
       if (event) event.preventDefault();

diff --git a/wp-pwa.php b/wp-pwa.php
@@ -812,7 +812,6 @@ function frontity_initialize_settings() {
 		"frontpage_forced" => false,
 		"html_purifier_active" => true,
 		"excludes" => array(),
-		"api_filters" => array(),
 	);
 
 	$settings = get_option('frontity_settings');
@@ -865,9 +864,6 @@ function frontity_update_settings() {
 		if (isset($old_settings['wp_pwa_excludes'])) {
 			$settings['excludes'] = $old_settings['wp_pwa_excludes'];
 		}
-		if (isset($old_settings['wp_pwa_api_fields'])) {
-			$settings['api_filters'] = $old_settings['wp_pwa_api_fields'];
-		}
 
 		update_option('frontity_settings', $settings);
 		delete_option('wp_pwa_settings');