@financial-times/x-topic-search 0.0.10 → 6.6.0

package/__tests__/x-topic-search.test.jsx

@@ -1,127 +1,128 @@
-const fetchMock = require('fetch-mock');
-const { h } = require('@financial-times/x-engine');
-const { mount } = require('@financial-times/x-test-utils/enzyme');
-const { TopicSearch } = require('../');
-
-const minSearchLength = 3;
-const maxSuggestions = 3;
-const apiUrl = 'api-url';
-const FOLLOWED_TOPIC_ID1 = 'Cat-House-id';
-const FOLLOWED_TOPIC_ID2 = 'Cat-Food-id';
-const UNFOLLOWED_TOPIC_ID1 = 'Cat-Toys-id';
+const fetchMock = require('fetch-mock')
+const { h } = require('@financial-times/x-engine')
+const { mount } = require('@financial-times/x-test-utils/enzyme')
+const { TopicSearch } = require('../')
+
+const minSearchLength = 3
+const maxSuggestions = 3
+const apiUrl = 'api-url'
+const FOLLOWED_TOPIC_ID1 = 'Cat-House-id'
+const FOLLOWED_TOPIC_ID2 = 'Cat-Food-id'
+const UNFOLLOWED_TOPIC_ID1 = 'Cat-Toys-id'
 
 describe('x-topic-search', () => {
-	const buildSearchUrl = term => `${apiUrl}?count=${maxSuggestions}&partial=${term}`;
-	const enterSearchTerm = searchTerm => {
-		target.find('input').simulate('input', { target: { value: searchTerm }});
+	const buildSearchUrl = (term) => `${apiUrl}?count=${maxSuggestions}&partial=${term}`
+	const enterSearchTerm = (searchTerm) => {
+		target.find('input').simulate('input', { target: { value: searchTerm } })
 
-		return new Promise(resolve => { setTimeout(resolve, 400); });
-	};
-	let target;
+		return new Promise((resolve) => {
+			setTimeout(resolve, 400)
+		})
+	}
+	let target
 
 	beforeEach(() => {
 		const props = {
 			minSearchLength,
 			maxSuggestions,
 			apiUrl,
-			followedTopicIds: [FOLLOWED_TOPIC_ID1, FOLLOWED_TOPIC_ID2],
-		};
-		target = mount(<TopicSearch {...props} />);
-	});
+			followedTopicIds: [FOLLOWED_TOPIC_ID1, FOLLOWED_TOPIC_ID2]
+		}
+		target = mount(<TopicSearch {...props} />)
+	})
 
 	afterEach(() => {
-		fetchMock.reset();
-	});
+		fetchMock.reset()
+	})
 
 	describe('initial rendering', () => {
 		it('should render with input box', () => {
-			expect(target.find('input').exists()).toBe(true);
-		});
+			expect(target.find('input').exists()).toBe(true)
+		})
 
 		it('should not display result container', () => {
-			expect(target.render().children('div')).toHaveLength(1);
-		});
-	});
+			expect(target.render().children('div')).toHaveLength(1)
+		})
+	})
 
 	describe('when input receives focus', () => {
 		it('selects the text in the input', () => {
-			const selectMock = jest.fn();
-			const inputBox = target.find('input');
+			const selectMock = jest.fn()
+			const inputBox = target.find('input')
 
-			inputBox.simulate('blur');
-			inputBox.simulate('focus', { target: { select: selectMock }});
+			inputBox.simulate('blur')
+			inputBox.simulate('focus', { target: { select: selectMock } })
 
-			expect(selectMock).toHaveBeenCalledTimes(1);
-		});
-	});
+			expect(selectMock).toHaveBeenCalledTimes(1)
+		})
+	})
 
 	describe('given inputted text is shorter than minSearchLength', () => {
-		const apiUrlWithResults = buildSearchUrl('a');
-
-		fetchMock.get(apiUrlWithResults, []);
+		const apiUrlWithResults = buildSearchUrl('a')
 
 		beforeEach(() => {
-			return enterSearchTerm('a');
-		});
+			fetchMock.get(apiUrlWithResults, [])
+			return enterSearchTerm('a')
+		})
 
 		it('does not make a request to the api or render any result', () => {
-			expect(fetchMock.called(apiUrlWithResults)).toBe(false);
-			expect(target.render().children('div')).toHaveLength(1);
-		});
-	});
+			expect(fetchMock.called(apiUrlWithResults)).toBe(false)
+			expect(target.render().children('div')).toHaveLength(1)
+		})
+	})
 
 	describe('given searchTerm which has some topic suggestions to follow', () => {
-		const apiUrlWithResults = buildSearchUrl('Cat');
+		const apiUrlWithResults = buildSearchUrl('Cat')
 		const results = [
 			{ id: FOLLOWED_TOPIC_ID1, prefLabel: 'Cat House', url: 'Cat-House-url' },
 			{ id: FOLLOWED_TOPIC_ID2, prefLabel: 'Cat Food', url: 'Cat-Food-url' },
 			{ id: UNFOLLOWED_TOPIC_ID1, prefLabel: 'Cat Toys', url: 'Cat-Toys-url' }
-		];
-
-		fetchMock.get(apiUrlWithResults, results);
+		]
 
 		beforeEach(() => {
-			return enterSearchTerm('Cat');
-		});
+			fetchMock.get(apiUrlWithResults, results)
+			return enterSearchTerm('Cat')
+		})
 
 		it('requests the topic suggestions with count set to maxSuggestions', () => {
-			expect(fetchMock.called(apiUrlWithResults)).toBe(true);
-		});
+			expect(fetchMock.called(apiUrlWithResults)).toBe(true)
+		})
 
 		it('renders no more than the max number of suggestions', () => {
-			expect(target.render().children('div')).toHaveLength(2);
-			expect(target.render().find('li')).toHaveLength(maxSuggestions);
-		});
+			expect(target.render().children('div')).toHaveLength(2)
+			expect(target.render().find('li')).toHaveLength(maxSuggestions)
+		})
 
 		it('renders links and follow buttons for each suggestion', () => {
-			const suggestionsList = target.render().find('li');
+			const suggestionsList = target.render().find('li')
 
 			results.forEach((topic, index) => {
-				const suggestion = suggestionsList.eq(index);
-
-				expect(suggestion.find('a').text()).toEqual(topic.prefLabel);
-				expect(suggestion.find('a').attr('href')).toEqual(topic.url);
-				expect(suggestion.find('button').text()).toEqual(topic.id === UNFOLLOWED_TOPIC_ID1 ? 'Add to myFT' : 'Added');
-			});
+				const suggestion = suggestionsList.eq(index)
+
+				expect(suggestion.find('a').text()).toEqual(topic.prefLabel)
+				expect(suggestion.find('a').attr('href')).toEqual(topic.url)
+				expect(suggestion.find('button').text()).toEqual(
+					topic.id === UNFOLLOWED_TOPIC_ID1 ? 'Add to myFT' : 'Added'
+				)
+			})
 		})
-	});
+	})
 
 	describe('given searchTerm which has no topic suggestions to follow', () => {
-		const apiUrlNoResults = buildSearchUrl('Dog');
-
-		fetchMock.get(apiUrlNoResults, []);
+		const apiUrlNoResults = buildSearchUrl('Dog')
 
 		beforeEach(() => {
-			return enterSearchTerm('Dog');
-		});
+			fetchMock.get(apiUrlNoResults, [])
+			return enterSearchTerm('Dog')
+		})
 
 		it('requests from the api and renders the no matching topics message', () => {
-			expect(fetchMock.called(apiUrlNoResults)).toBe(true);
+			expect(fetchMock.called(apiUrlNoResults)).toBe(true)
 
-			const resultContainer = target.render().children('div').eq(1);
+			const resultContainer = target.render().children('div').eq(1)
 
-			expect(resultContainer).toHaveLength(1);
-			expect(resultContainer.find('h2').text()).toMatch('No topics matching');
-		});
-	});
-});
+			expect(resultContainer).toHaveLength(1)
+			expect(resultContainer.find('h2').text()).toMatch('No topics matching')
+		})
+	})
+})

package/bower.json

@@ -3,8 +3,9 @@
   "main": "dist/TopicSearch.es5.js",
   "private": true,
   "dependencies": {
-    "o-icons": "^5.8.0",
-    "o-typography": "^5.7.8",
-    "o-colors": "^4.7.7"
+    "o-icons": "^6.3.0",
+    "o-typography": "^6.4.6",
+    "o-editorial-typography": "^1.2.1",
+    "o-colors": "^5.4.1"
   }
 }

package/bower_components/fontfaceobserver/package.json

@@ -0,0 +1,57 @@
+{
+  "name": "fontfaceobserver",
+  "version": "2.1.0",
+  "description": "Detect if web fonts are available",
+  "directories": {
+    "test": "test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bramstein/fontfaceobserver.git"
+  },
+  "bugs": {
+    "url": "https://github.com/bramstein/fontfaceobserver/issues"
+  },
+  "homepage": "https://fontfaceobserver.com/",
+  "main": "fontfaceobserver.standalone.js",
+  "keywords": [
+    "fontloader",
+    "fonts",
+    "font",
+    "font-face",
+    "web font",
+    "font load",
+    "font events"
+  ],
+  "files": [
+    "fontfaceobserver.js",
+    "fontfaceobserver.standalone.js",
+    "src/*.js",
+    "externs.js"
+  ],
+  "author": "Bram Stein <b.l.stein@gmail.com> (http://www.bramstein.com/)",
+  "license": "BSD-3-Clause",
+  "dependencies": {},
+  "devDependencies": {
+    "closure-dom": "=0.2.6",
+    "extend": "^3.0.0",
+    "google-closure-compiler": "=20161024.0.0",
+    "grunt": "^1.0.3",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-exec": "~1.0.0",
+    "mocha": "^5.2.0",
+    "mocha-phantomjs-core": "^2.0.0",
+    "phantomjs-prebuilt": "^2.1.7",
+    "promis": "=1.1.4",
+    "sinon": "^1.17.4",
+    "unexpected": "^10.14.2"
+  },
+  "scripts": {
+    "preversion": "npm test",
+    "version": "grunt dist && git add fontfaceobserver.js && git add fontfaceobserver.standalone.js",
+    "postversion": "git push && git push --tags && rm -rf build && npm publish",
+    "test": "grunt test"
+  }
+}

package/bower_components/fticons/.bower.json

@@ -1,14 +1,14 @@
 {
   "name": "fticons",
   "homepage": "https://github.com/Financial-Times/fticons",
-  "version": "1.19.0",
-  "_release": "1.19.0",
+  "version": "1.23.2",
+  "_release": "1.23.2",
   "_resolution": {
     "type": "version",
-    "tag": "v1.19.0",
-    "commit": "964ca01cb88f7c6a4066f907f21ef8ac2d441021"
+    "tag": "v1.23.2",
+    "commit": "580a76d5ba6c6718675990f17ac991b623668170"
   },
   "_source": "https://github.com/Financial-Times/fticons.git",
-  "_target": "^1.15.1",
+  "_target": "^1.23.1",
   "_originalSource": "fticons"
 }

package/bower_components/fticons/.github/CODEOWNERS

@@ -2,6 +2,6 @@
 # This file adds the owner as a reviewer for all pull requests made to this repository.
 # It references owners by source order - the last matching pattern takes the most precedence.
 
-# If you would like to be added as an owner, please get in touch with the Origami team at origami.support@ft.com or #ft-origami on Slack
+# If you would like to be added as an owner, please get in touch with the Origami team at origami.support@ft.com or #origami-support on Slack
 
 * @Financial-Times/origami-core

package/bower_components/fticons/.github/ISSUE_TEMPLATE.md

@@ -6,7 +6,7 @@ title: Issue: [type] [short description]
 <!--
 Please make sure you've checked that your issue hasn't already been raised within this repository.
 
-If you need help with submitting an issue, please get in touch with the Origami Team at origami.support@ft.com or #ft-origami on Slack.
+If you need help with submitting an issue, please get in touch with the Origami Team at origami.support@ft.com or #origami-support on Slack.
 -->
 ## What
 <!-- A clear description of what the problem or feature request is -->

package/bower_components/fticons/.github/PULL_REQUEST_TEMPLATE.md

@@ -13,7 +13,6 @@
 - [ ] Icons should have square rather than rounded corners where suitable
 - [ ] Icons must be SVG v1.1
 - [ ] Icons must have been run through an SVG compression service (such as SVGOMG)
-- [ ] Icons should have a bounding box of 1024.
 - [ ] Icon names must be made up only of lowecase a-z, or a hyphen
 - [ ] Icon names must include the .svg file extension
 

package/bower_components/fticons/.github/workflows/add-new-issues-and-pull-requests-to-origami-project-board.yml

@@ -0,0 +1,15 @@
+name: Add new issues and pull requests to Origami Project Board
+on:
+  - issues
+  - pull_request_target
+
+jobs:
+  origami_project_board_job:
+    runs-on: ubuntu-latest
+    name: Add new issue or pull request to Origami Project Board
+    steps:
+      - name: Add new issue or pull request to Origami Project Board
+        id: origami-project-board
+        uses: Financial-Times/origami-project-board-action@v1
+        with:
+          origami-fox-access-token: ${{ secrets.ORIGAMI_FOX_ACCESS_TOKEN }}

package/bower_components/fticons/.github/workflows/apply-labels.yml

@@ -0,0 +1,13 @@
+name: Apply Origami labels
+on:
+  - issues
+  - pull_request_target
+jobs:
+  apply-labels:
+    runs-on: ubuntu-latest
+    name: Apply Origami labels to new issues and pull requests.
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Financial-Times/origami-apply-labels@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

package/bower_components/fticons/.github/workflows/auto-approve.yml

@@ -0,0 +1,23 @@
+name: Auto Approve Dependabot PRs
+
+on:
+  pull_request_target:
+    types: [labeled]
+
+jobs:
+  auto-update-dependabot:
+    name: Auto-Approve and enable Auto-Merge for all Dependabot PRs
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
+    steps:
+
+    # Enable auto-merge *before* issuing an approval.
+    - name: Enable Github Automerge
+      uses: alexwilson/enable-github-automerge-action@main
+      with:
+        github-token: "${{ secrets.ORIGAMI_FOX_ACCESS_TOKEN }}"
+
+    # We "trust" dependabot updates (this still requires all other checks to pass!)
+    - uses: hmarr/auto-approve-action@5d04a5ca6da9aeb8ca9f31a5239b96fc3e003029
+      with:
+        github-token: "${{ secrets.ORIGAMI_FOX_ACCESS_TOKEN }}"

package/bower_components/fticons/.github/workflows/automatic-tag-and-release.yml

@@ -0,0 +1,21 @@
+on:
+  pull_request:
+    types: [closed] # Merged pull-requests count as closed pull-requests.
+
+jobs:
+  create-new-version:
+    runs-on: ubuntu-latest
+    name: Create new version/tag
+    steps:
+      - uses: actions/checkout@v2
+        if: github.event.pull_request.merged # Only run on merged pull-requests
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }} # Checkout the merged commit
+          fetch-depth: 0
+      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* # Get all tags from the origin
+        if: github.event.pull_request.merged # Only run on merged pull-requests
+      - uses: Financial-Times/origami-version@v1.2.1
+        name: Create new version/tag
+        if: github.event.pull_request.merged # Only run on merged pull-requests
+        with:
+          github-token: ${{ secrets.ORIGAMI_GITHUB_TOKEN }}

package/bower_components/fticons/.github/workflows/publish.yml

@@ -0,0 +1,26 @@
+name: Publish to npm and s3
+on:
+  release:
+    types: [created]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2.1.5
+      with:
+        node-version: '12.x'
+        registry-url: 'https://registry.npmjs.org'
+    - run: git config --global user.email "origami.support@ft.com";
+    - run: git config --global user.name "origamiserviceuser [bot]";
+    - run: npm ci
+    - name: Get the version
+      id: version
+      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+    - run: npm version --no-git-tag-version ${{ steps.version.outputs.VERSION }}
+    - run: git push origin HEAD:master
+    - run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}

package/bower_components/fticons/.github/workflows/sync-repo-labels.yml

@@ -0,0 +1,12 @@
+name: Sync Origami labels
+on:
+  - issues
+  - pull_request_target
+jobs:
+  sync-labels:
+    runs-on: ubuntu-latest
+    name: Sync repository labels
+    steps:
+      - uses: Financial-Times/origami-labels@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

package/bower_components/fticons/README.md

@@ -1,4 +1,4 @@
-# Icon set for FT [![CircleCI](https://circleci.com/gh/Financial-Times/fticons.svg?style=svg)](https://circleci.com/gh/Financial-Times/fticons)
+# Icon set for FT 
 This is the (new) icon set for FT websites. It replaces the assets in [o-icons](http://github.com/financial-times/o-icons).
 
 The icons have been designed to work best at 40px width and height. At this size they align precisely with the pixel grid and do not appear blurry on screens with a DPR of 1 (non-retina screens).
@@ -80,7 +80,7 @@ The following icons no longer exist:
 
 ## Contact
 
-If you have any questions or comments about this component, or need help using it, please either [raise an issue](https://github.com/Financial-Times/fticons/issues), visit [#ft-origami](https://financialtimes.slack.com/messages/ft-origami/) or email [Origami Support](mailto:origami-support@ft.com).
+If you have any questions or comments about this component, or need help using it, please either [raise an issue](https://github.com/Financial-Times/fticons/issues), visit [#origami-support](https://financialtimes.slack.com/messages/origami-support/) or email [Origami Support](mailto:origami-support@ft.com).
 
 ----
 

package/bower_components/fticons/contributing.md

@@ -1,6 +1,6 @@
 # How to contribute to fticons
 
-Thank you for your interest in contributing to fticons! As our icons are used by a lot of different applications, we have a few constraints for new ones. If you aren't sure if your new icon meets any of these, please [raise an issue](http://github.com/financial-times/fticons/issues), or ask in the [#ft-origami slack channel](https://financialtimes.slack.com/messages/ft-origami/).
+Thank you for your interest in contributing to fticons! As our icons are used by a lot of different applications, we have a few constraints for new ones. If you aren't sure if your new icon meets any of these, please [raise an issue](http://github.com/financial-times/fticons/issues), or ask in the [#origami-support slack channel](https://financialtimes.slack.com/messages/origami-support/).
 Thank you!
 
 ## Adding or updating an icon
@@ -24,8 +24,6 @@ If you want to add or update an icon, please open a pull request, making sure th
 1. Icons must have been run through an SVG compression service (such as [SVGOMG](https://jakearchibald.github.io/svgomg/))
 1. Icons must have been tested with the [Responsive Image Service](https://www.ft.com/__origami/service/image/v2/docs/url-builder)'s SVG -> PNG conversion. [How do I do this?](#how-to-test-an-icon-with-the-image-service)
 1. Icons must have been tested with the Image Service's tinting option. [How do I do this?](#how-to-test-an-icon-with-the-image-service)
-1. Icons should have a bounding box of 1024. This is because of a quirk with the Image Service, whereby a conversion from SVG to PNG will be very blurry if the _source_ SVG has a small viewBox.
-
 
 ### Naming conventions: