Merge pull request #971 from open-apparel-registry/tw/rename-parent-c…

…ompany

Update parent company label

CHANGELOG.md

@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Ignore case for forgot-password email [#970] [https://github.com/open-apparel-registry/open-apparel-registry/pull/970]
 
+- Update 'parent company' label to 'parent company / supplier group' [#971] (https://github.com/open-apparel-registry/open-apparel-registry/pull/971)
+
 ### Security
 
 ## [2.22.0] - 2020-02-20

src/app/src/actions/claimFacility.js

@@ -118,7 +118,7 @@ export function fetchParentCompanyOptions() {
             .then(data => dispatch(completeFetchParentCompanyOptions(data)))
             .catch(err => dispatch(logErrorAndDispatchFailure(
                 err,
-                'An error prevented fetching parent company options',
+                'An error prevented fetching parent company / supplier group options',
                 failFetchParentCompanyOptions,
             )));
     };

src/app/src/components/ClaimFacilityIntroStep.jsx

@@ -73,7 +73,8 @@ export default function ClaimFacilityIntroStep() {
                     </ListItemIcon>
                     <ListItemText>
                         <Typography variant="headline">
-                            Add information about your head office and parent company
+                            Add information about your head office
+                            and parent company / supplier group
                         </Typography>
                     </ListItemText>
                 </ListItem>

src/app/src/components/ClaimedFacilitiesDetails.jsx

@@ -415,7 +415,7 @@ function ClaimedFacilitiesDetails({
                 />
                 <ShowOnly when={!isEmpty(contributorOptions)}>
                     <InputSection
-                        label="Parent Company"
+                        label="Parent Company / Supplier Group"
                         aside={parentCompanyAside}
                         value={get(data, 'facility_parent_company.id', null)}
                         onChange={updateParentCompany}
@@ -426,7 +426,7 @@ function ClaimedFacilitiesDetails({
                 </ShowOnly>
                 <ShowOnly when={!contributorOptions}>
                     <Typography>
-                        Parent Company
+                        Parent Company / Supplier Group
                     </Typography>
                     <Typography>
                         {get(data, 'facility_parent_company.name', null)}

src/app/src/components/DashboardClaimsDetails.jsx

@@ -163,7 +163,7 @@ function DashboardClaimsDetails({
                     }
                 />
                 <InfoSection
-                    label="Facility Parent Company"
+                    label="Facility Parent Company / Supplier Group"
                     value={
                         (() => {
                             const parentCompanyName = get(data, 'facility_parent_company.name', null);

src/app/src/components/FacilityDetailSidebarClaimedInfo.jsx

@@ -76,7 +76,7 @@ export default function FacilityDetailsSidebarClaimedInfo({
                 value={facility.address}
             />
             <ClaimInfoSection
-                label="Parent Company"
+                label="Parent Company / Supplier Group"
                 value={
                     facility.parent_company
                         ? (

src/app/src/util/constants.js

@@ -451,9 +451,10 @@ export const claimAFacilityFormFields = Object.freeze({
     }),
     parentCompany: Object.freeze({
         id: 'parent-company',
-        label: 'Parent company',
-        aside: `If you cannot find the parent company in this list consider
-inviting them to register with the Open Apparel Registry.`,
+        label: 'Parent company / supplier group',
+        aside: `If you cannot find the parent company / supplier group
+        in this list consider inviting them to register with the Open Apparel
+        Registry.`,
     }),
     website: Object.freeze({
         id: 'website',

src/django/api/migrations/0043_facility_claim_parent_company_verbose_name_change.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.10 on 2020-03-04 14:10
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0042_add_can_view_full_contrib_detail_flag'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='facilityclaim',
+            name='parent_company',
+            field=models.ForeignKey(default=None, help_text='The parent company / supplier group of this facility claim.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='parent_company', to='api.Contributor', verbose_name='parent company / supplier group'),
+        ),
+        migrations.AlterField(
+            model_name='historicalfacilityclaim',
+            name='parent_company',
+            field=models.ForeignKey(blank=True, db_constraint=False, default=None, help_text='The parent company / supplier group of this facility claim.', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='api.Contributor', verbose_name='parent company / supplier group'),
+        ),
+    ]

src/django/api/models.py

@@ -873,8 +873,9 @@ class FacilityClaim(models.Model):
         null=True,
         default=None,
         on_delete=models.PROTECT,
-        verbose_name='parent company',
-        help_text='The parent company of this facility claim.')
+        verbose_name='parent company / supplier group',
+        help_text='The parent company / supplier group of this '
+        'facility claim.')
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)