Merge branch 'master' into add-inventory

Author: jackcmeyer

.gitpod.yml

@@ -1,3 +1,17 @@
+# [3.2.0](https://github.com/HospitalRun/components/compare/v3.1.0...v3.2.0) (2020-12-26)
+
+
+### Features
+
+* **icon:** add billing icon ([#670](https://github.com/HospitalRun/components/issues/670)) ([b81d9d9](https://github.com/HospitalRun/components/commit/b81d9d9018e4479a6b6cc97701fe48ad1ac24250))
+
+# [3.1.0](https://github.com/HospitalRun/components/compare/v3.0.4...v3.1.0) (2020-12-18)
+
+
+### Features
+
+* **textfield:** add id prop to text field ([dd0ce21](https://github.com/HospitalRun/components/commit/dd0ce21cc06f2f6605ab98c412c94add76439e87))
+
 ## [3.0.4](https://github.com/HospitalRun/components/compare/v3.0.3...v3.0.4) (2020-11-08)
 
 

CHANGELOG.md

@@ -5,7 +5,7 @@
 [![NPM Version](https://badgen.net/npm/v/@hospitalrun/components)](https://www.npmjs.com/package/@hospitalrun/components) [![GitHub CI](https://github.com/HospitalRun/components/workflows/GitHub%20CI/badge.svg)](https://github.com/HospitalRun/components/actions) [![Coverage Status](https://coveralls.io/repos/github/HospitalRun/components/badge.svg?branch=master)](https://coveralls.io/github/HospitalRun/components?branch=master) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/HospitalRun/components.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/HospitalRun/components/context:javascript)
 [![Bundlephobia](https://badgen.net/bundlephobia/min/@hospitalrun/components)](https://bundlephobia.com/result?p=@hospitalrun/components) ![Code scanning](https://github.com/HospitalRun/components/workflows/Code%20scanning/badge.svg?branch=master) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FHospitalRun%2Fcomponents.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FHospitalRun%2Fcomponents?ref=badge_shield)
 ![dependabot](https://api.dependabot.com/badges/status?host=github&repo=HospitalRun/components) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
-[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![Netlify Status](https://api.netlify.com/api/v1/badges/70c843de-c1b2-4e7d-abb5-61939f21f8cb/deploy-status)](https://app.netlify.com/sites/hospitalrun-components/deploys) [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/HospitalRun/components) [![Slack](https://hospitalrun-slackin.herokuapp.com/badge.svg)](https://hospitalrun-slackin.herokuapp.com) 
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![Netlify Status](https://api.netlify.com/api/v1/badges/70c843de-c1b2-4e7d-abb5-61939f21f8cb/deploy-status)](https://app.netlify.com/sites/hospitalrun-components/deploys) [![Slack](https://hospitalrun-slackin.herokuapp.com/badge.svg)](https://hospitalrun-slackin.herokuapp.com) 
 
 </div>
 
@@ -46,9 +46,7 @@ Contributions are always welcome. Before contributing please read our [contribut
 
 ## Online one-click setup for contributing
 
-Contribute to HospitalRun using a fully featured online development environment that will automatically: clone the repo, install the dependencies and start the webserver.
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/HospitalRun/components)
+Contribute to HospitalRun using [GitHub Codespace](https://github.com/codespaces) a fully featured online development environment that will automatically: clone the repo, install the dependencies and start the webserver.
 
 ## Working on an Issue
 

README.md

@@ -1,6 +1,6 @@
 {
   "name": "@hospitalrun/components",
-  "version": "3.0.4",
+  "version": "3.2.0",
   "license": "MIT",
   "funding": {
     "type": "opencollective",
@@ -101,9 +101,9 @@
     "cz-conventional-changelog": "~3.3.0",
     "enzyme": "~3.11.0",
     "enzyme-adapter-react-16": "~1.15.2",
-    "eslint": "~7.15.0",
+    "eslint": "~7.16.0",
     "eslint-config-airbnb": "~18.2.0",
-    "eslint-config-prettier": "~7.0.0",
+    "eslint-config-prettier": "~7.1.0",
     "eslint-plugin-import": "~2.22.0",
     "eslint-plugin-jest": "~24.1.0",
     "eslint-plugin-jsx-a11y": "~6.4.1",

package.json

@@ -4,6 +4,10 @@ import Form from 'react-bootstrap/Form'
 import { getControlSize } from '../../helpers/controlSize'
 
 interface Props {
+  /** A unique identifier for the componentchrome
+   *
+   */
+  id?: string
   /** Determines whether the TextField should be disabled or not. By default, it is false. */
   disabled?: boolean
   /** Determines whether the TextField should be rendered as invalid or not. By default, it is false. */
@@ -39,6 +43,7 @@ interface Props {
  */
 const TextField = (props: Props) => {
   const {
+    id,
     disabled,
     isValid,
     isInvalid,
@@ -56,6 +61,7 @@ const TextField = (props: Props) => {
   return (
     <Form.Group>
       <Form.Control
+        id={id}
         as="textarea"
         disabled={disabled}
         isInvalid={isInvalid}

src/components/TextField/TextField.tsx

@@ -16,9 +16,13 @@ describe('TextField', () => {
   it('renders a TextField with attributes', () => {
     const name = 'example_field'
     const value = 'this is teh text field text'
+    const id = 'someId'
     const rows = 5
-    const wrapper = mount(<TextField name={name} value={value} onChange={onChange} rows={rows} />)
+    const wrapper = mount(
+      <TextField id={id} name={name} value={value} onChange={onChange} rows={rows} />,
+    )
 
+    expect(wrapper.find(HTMLTextAreaElement).prop('id')).toEqual(id)
     expect(wrapper.find(HTMLTextAreaElement)).toHaveLength(1)
     expect(
       wrapper.find(HTMLTextAreaElement).filterWhere((item) => item.prop('name') === name),