Merge pull request #679 from open-apparel-registry/ki/make-facility-d…

…escription-required

Require claim form facility description

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Add facility field changes to contributor notification emails [#649](https://github.com/open-apparel-registry/open-apparel-registry/pull/649)
 - Add affiliations and certifications fields to claimed facility profile [#671](https://github.com/open-apparel-registry/open-apparel-registry/pull/671)
 - Add product and production type to claimed facility profile [#680](https://github.com/open-apparel-registry/open-apparel-registry/pull/680)
+- Make facility description required on claim a facility form [#679](https://github.com/open-apparel-registry/open-apparel-registry/pull/679)
 
 ### Deprecated
 

src/app/src/__tests__/utils.tests.js

@@ -1201,6 +1201,7 @@ it('checks whether the claim a facility form is valid', () => {
         companyName: 'companyName',
         contactPerson: 'contactPerson',
         phoneNumber: 'phoneNumber',
+        facilityDescription: 'facilityDescription',
         preferredContactMethod: {
             label: 'label',
             value: 'value',

src/app/src/components/ClaimFacilityFacilityInfoStep.jsx

@@ -121,10 +121,12 @@ function ClaimFacilityFacilityInfoStep({
                 <InputLabel htmlFor={descriptionFormField.id}>
                     <Typography variant="title">
                         {descriptionFormField.label}
+                        <RequiredAsterisk />
                     </Typography>
                 </InputLabel>
                 <TextField
                     id={descriptionFormField.label}
+                    error={isEmpty(facilityDescription)}
                     variant="outlined"
                     style={claimAFacilityFormStyles.textFieldStyles}
                     multiline

src/app/src/util/util.js

@@ -618,10 +618,14 @@ export const claimFacilityContactInfoStepIsValid = ({
 
 export const isValidFacilityURL = url => isEmpty(url) || isURL(url, { protocols: ['http', 'https'] });
 
-export const claimFacilityFacilityInfoStepIsValid = ({ companyName, website }) =>
-    every([
-        !isEmpty(companyName),
-        isValidFacilityURL(website),
-    ]);
+export const claimFacilityFacilityInfoStepIsValid = ({
+    companyName,
+    website,
+    facilityDescription,
+}) => every([
+    !isEmpty(companyName),
+    isValidFacilityURL(website),
+    !isEmpty(facilityDescription),
+]);
 
 export const anyListItemMatchesAreInactive = ({ matches }) => some(matches, ['is_active', false]);

src/django/api/migrations/0025_require_claim_form_description.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.0.13 on 2019-07-16 14:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0024_add_affiliations_and_certifications_to_facility_claim'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='facilityclaim',
+            name='facility_description',
+            field=models.TextField(help_text='A description of the facility', verbose_name='description'),
+        ),
+        migrations.AlterField(
+            model_name='historicalfacilityclaim',
+            name='facility_description',
+            field=models.TextField(help_text='A description of the facility', verbose_name='description'),
+        ),
+    ]

src/django/api/migrations/0027_merge_20190716_2207.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.0.13 on 2019-07-16 22:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0026_add_product_and_production_types_to_facilityclaim'),
+        ('api', '0025_require_claim_form_description'),
+    ]
+
+    operations = [
+    ]

src/django/api/models.py

@@ -530,7 +530,7 @@ class FacilityClaim(models.Model):
         help_text='The website for the facility')
     facility_description = models.TextField(
         null=False,
-        blank=True,
+        blank=False,
         verbose_name='description',
         help_text='A description of the facility')
     linkedin_profile = models.URLField(