Update Skill Code text to Skill, except on CDO views

src/Components/BidCount/BidCountNumber/__snapshots__/BidCountNumber.test.jsx.snap

@@ -38,7 +38,7 @@ exports[`BidCountNumberComponent matches snapshot where type = atSkillBids 1`] =
     style={Object {}}
     tabIndex="0"
     theme="dark"
-    title="Number of bidders who are at Skill code."
+    title="Number of bidders who are at Skill."
     touchHold={false}
     trigger="mouseenter focus"
     unmountHTMLWhenHide={false}
@@ -90,7 +90,7 @@ exports[`BidCountNumberComponent matches snapshot where type = inGradeAtSkillBid
     style={Object {}}
     tabIndex="0"
     theme="dark"
-    title="Number of bidders who are at Grade and Skill code."
+    title="Number of bidders who are at Grade and Skill."
     touchHold={false}
     trigger="mouseenter focus"
     unmountHTMLWhenHide={false}

src/Components/BidTracker/OverlayAlert/DraftAlert/DraftAlert.jsx

@@ -59,7 +59,7 @@ class DraftAlert extends Component {
               {post}
             </div>
             <div>
-              <span className="title">Skill code: </span>
+              <span className="title">Skill: </span>
               {skillCode}
             </div>
             <div>

src/Components/BidTracker/OverlayAlert/DraftAlert/__snapshots__/DraftAlert.test.jsx.snap

@@ -55,7 +55,7 @@ exports[`DraftAlertComponent matches snapshot 1`] = `
         <span
           className="title"
         >
-          Skill code: 
+          Skill: 
         </span>
         POLITICAL AND ECONOMIC AFFAIRS (6050)
       </div>

src/Components/CompareList/CompareList.jsx

@@ -67,7 +67,7 @@ const CompareList = ({ compare, isLoading }) => {
                     }
                   </tr>
                   <tr>
-                    <th scope="row">Skill code</th>
+                    <th scope="row">Skill</th>
                     {
                       compareArray.map(c => (
                         <td key={shortId.generate()}>{c.skill || NO_SKILL}</td>

src/Components/CompareList/__snapshots__/CompareList.test.jsx.snap

@@ -108,7 +108,7 @@ exports[`CompareListComponent matches snapshot 1`] = `
             <th
               scope="row"
             >
-              Skill code
+              Skill
             </th>
             <td>
               None listed
@@ -367,7 +367,7 @@ exports[`CompareListComponent matches snapshot when there is an obc id 1`] = `
             <th
               scope="row"
             >
-              Skill code
+              Skill
             </th>
             <td>
               None listed

src/Components/CondensedCardData/CondensedCardData.jsx

@@ -11,7 +11,7 @@ const CondensedCardData = ({ position }) => {
   return (
     <div className="usa-grid-full condensed-card-data">
       <CondensedCardDataPoint
-        title="Skill code"
+        title="Skill"
         content={position.skill || NO_SKILL}
         hasFixedTitleWidth
       />

src/Components/CondensedCardData/__snapshots__/CondensedCardData.test.jsx.snap

@@ -7,7 +7,7 @@ exports[`CondensedCardDataComponent matches snapshot 1`] = `
   <CondensedCardDataPoint
     content="OFFICE MANAGEMENT (9017)"
     hasFixedTitleWidth={true}
-    title="Skill code"
+    title="Skill"
   />
   <CondensedCardDataPoint
     content="Freetown, Sierra Leone"
@@ -39,7 +39,7 @@ exports[`CondensedCardDataComponent matches snapshot with an empty estimated end
   <CondensedCardDataPoint
     content="None listed"
     hasFixedTitleWidth={true}
-    title="Skill code"
+    title="Skill"
   />
   <CondensedCardDataPoint
     content="Freetown, Sierra Leone"
@@ -71,7 +71,7 @@ exports[`CondensedCardDataComponent matches snapshot with an empty skill 1`] = `
   <CondensedCardDataPoint
     content="None listed"
     hasFixedTitleWidth={true}
-    title="Skill code"
+    title="Skill"
   />
   <CondensedCardDataPoint
     content="Freetown, Sierra Leone"

src/Components/HomePageFiltersSection/HomePageFiltersContainer/HomePageFilters/HomePageFilters.jsx

@@ -13,7 +13,7 @@ const HomePageFiltersSection = ({ filters, submitSearch, onFilterSelect, isLoadi
     <div className="usa-grid-full">
       <Form className="usa-grid-full" onFormSubmit={submitSearch}>
         <FieldSet
-          legend="Search by Skill code"
+          legend="Search by Skill"
         >
           <SkillCodeFilter
             filters={skillCodesData}

src/Components/HomePageFiltersSection/HomePageFiltersContainer/HomePageFilters/__snapshots__/HomePageFilters.test.jsx.snap

@@ -10,7 +10,7 @@ exports[`HomePageFiltersComponent matches snapshot 1`] = `
   >
     <FieldSet
       className=""
-      legend="Search by Skill code"
+      legend="Search by Skill"
       legendSrOnly={false}
     >
       <SkillCodeFilter

src/Components/HomePageFiltersSection/SkillCodeFilter/SkillCodeFilter.jsx

@@ -75,7 +75,7 @@ class SkillCodeFilter extends Component {
           options={sortedOptions}
           onChange={this.handleChange}
           closeOnSelect={false}
-          placeholder="Select Skill codes"
+          placeholder="Select Skills"
           isLoading={isLoading}
           tabSelectsValue={false /* avoid focus trap */}
         />

src/Components/HomePageFiltersSection/SkillCodeFilter/__snapshots__/SkillCodeFilter.test.jsx.snap

@@ -53,7 +53,7 @@ exports[`SkillCodeFilterComponent matches snapshot 1`] = `
       ]
     }
     pageSize={5}
-    placeholder="Select Skill codes"
+    placeholder="Select Skills"
     removeSelected={true}
     required={false}
     rtl={false}

src/Components/PositionDetailsItem/PositionDetailsItem.jsx

@@ -76,7 +76,7 @@ const PositionDetailsItem = (props) => {
           />
           <div className="usa-grid-full data-point-section">
             <CondensedCardDataPoint ariaLabel={getAccessiblePositionNumber(details.position_number)} title="Position number" content={details.position_number} />
-            <CondensedCardDataPoint title="Skill code" content={details.skill || NO_SKILL} />
+            <CondensedCardDataPoint title="Skill" content={details.skill || NO_SKILL} />
             <CondensedCardDataPoint title="Grade" content={details.grade || NO_GRADE} />
             <CondensedCardDataPoint title="Bureau" content={formattedBureau} />
             <CondensedCardDataPoint title="Tour of duty" content={formattedTOD} />

src/Components/PositionDetailsItem/__snapshots__/PositionDetailsItem.test.jsx.snap

@@ -60,7 +60,7 @@ exports[`PositionDetailsItem matches snapshot 1`] = `
         <CondensedCardDataPoint
           content="OFFICE MANAGEMENT (9017)"
           hasFixedTitleWidth={false}
-          title="Skill code"
+          title="Skill"
         />
         <CondensedCardDataPoint
           content="05"
@@ -254,7 +254,7 @@ exports[`PositionDetailsItem matches snapshot when there is an obc id 1`] = `
         <CondensedCardDataPoint
           content="OFFICE MANAGEMENT (9017)"
           hasFixedTitleWidth={false}
-          title="Skill code"
+          title="Skill"
         />
         <CondensedCardDataPoint
           content="05"
@@ -479,7 +479,7 @@ exports[`PositionDetailsItem matches snapshot when various data is missing from
         <CondensedCardDataPoint
           content="None listed"
           hasFixedTitleWidth={false}
-          title="Skill code"
+          title="Skill"
         />
         <CondensedCardDataPoint
           content="None listed"

src/Components/ProfileDashboard/Favorites/FavoritesListResultsCard/FavoriteContent/FavoriteContent.jsx

@@ -10,7 +10,7 @@ const FavoriteContent = ({ position }) => (
       {position.title}
     </div>
     <div>
-      <span className="bid-list-card-title-post">Skill code: </span>
+      <span className="bid-list-card-title-post">Skill: </span>
       {propOrDefault(position, 'skill', NO_SKILL)}
     </div>
     <div>

src/Components/ProfileDashboard/Favorites/FavoritesListResultsCard/FavoriteContent/__snapshots__/FavoriteContent.test.jsx.snap

@@ -16,7 +16,7 @@ exports[`FavoriteContentComponent matches snapshot 1`] = `
     <span
       className="bid-list-card-title-post"
     >
-      Skill code: 
+      Skill: 
     </span>
     OFFICE MANAGEMENT (9017)
   </div>

src/Components/ProfileDashboard/PositionInformation/PositionInformation.jsx

@@ -40,7 +40,7 @@ const PositionInformation = ({ assignment }) => {
           content={formattedPosition}
         />
         <InformationDataPoint
-          title="Skill code"
+          title="Skill"
           content={formattedSkill}
         />
       </div>

src/Components/ProfileDashboard/PositionInformation/__snapshots__/PositionInformation.test.jsx.snap

@@ -43,7 +43,7 @@ exports[`PositionInformationComponent matches snapshot 1`] = `
       className=""
       content="CONSTRUCTION ENGINEERING (6218)"
       sideBySide={false}
-      title="Skill code"
+      title="Skill"
       titleOnBottom={false}
     />
   </div>

src/Components/ResultsCard/ResultsCard.jsx

@@ -72,7 +72,7 @@ const ResultsCard = (props) => {
     /* eslint-disable quote-props */
     {
       'Bid cycle': getResult(result, 'latest_bidcycle.name', NO_BID_CYCLE),
-      'Skill code': getResult(result, 'skill', NO_SKILL),
+      'Skill': getResult(result, 'skill', NO_SKILL),
       'Grade': getResult(result, 'grade', NO_GRADE),
       'Bureau': getResult(result, 'bureau', NO_BUREAU),
       'Post': post,

src/Components/ResultsMultiSearchHeader/ResultsMultiSearchHeader.jsx

@@ -182,7 +182,7 @@ class ResultsMultiSearchHeader extends Component {
                   </div>
                   <div className="usa-width-one-fourth search-results-inputs search-keyword">
                     <SkillCodeFilter
-                      label="Skill Code"
+                      label="Skill"
                       isLoading={filtersIsLoading}
                       filters={skillCodesData}
                       onFilterSelect={this.onChangeSkills}
@@ -244,7 +244,7 @@ ResultsMultiSearchHeader.defaultProps = {
   filters: [],
   defaultFilters: {},
   filtersIsLoading: false,
-  placeholder: 'Location, Skill cone (code), Grade, Language, Position number',
+  placeholder: 'Location, Skill, Grade, Language, Position number',
   userProfile: {},
   onFilterChange: EMPTY_FUNCTION,
 };

src/Components/ResultsMultiSearchHeader/__snapshots__/ResultsMultiSearchHeader.test.jsx.snap

@@ -38,7 +38,7 @@ exports[`ResultsMultiSearchHeaderComponent matches snapshot 1`] = `
                 noForm={true}
                 onChangeText={[Function]}
                 onSubmitSearch={[Function]}
-                placeholder="Location, Skill cone (code), Grade, Language, Position number"
+                placeholder="Location, Skill, Grade, Language, Position number"
                 submitDisabled={false}
                 submitText="Search"
                 type="medium"
@@ -62,7 +62,7 @@ exports[`ResultsMultiSearchHeaderComponent matches snapshot 1`] = `
                   ]
                 }
                 isLoading={false}
-                label="Skill Code"
+                label="Skill"
                 labelSrOnly={false}
                 onFilterSelect={[Function]}
                 userSkills={

src/Components/ResultsSearchHeader/ResultsSearchHeader.jsx

@@ -77,7 +77,7 @@ ResultsSearchHeader.defaultProps = {
   onFilterChange: EMPTY_FUNCTION,
   defaultKeyword: '',
   labelSrOnly: false,
-  placeholder: 'Location, Skill cone (code), Grade, Language, Position number',
+  placeholder: 'Location, Skill, Grade, Language, Position number',
 };
 
 export default ResultsSearchHeader;

src/Components/ResultsSearchHeader/__snapshots__/ResultsSearchHeader.test.jsx.snap

@@ -32,7 +32,7 @@ exports[`ResultsSearchHeaderComponent matches snapshot 1`] = `
             noForm={true}
             onChangeText={[Function]}
             onSubmitSearch={[Function]}
-            placeholder="Location, Skill cone (code), Grade, Language, Position number"
+            placeholder="Location, Skill, Grade, Language, Position number"
             submitDisabled={false}
             submitText="Search"
             type="medium"

src/Components/SearchFilters/SkillFilter/SkillFilter.test.jsx

@@ -21,7 +21,7 @@ describe('SkillFilterComponent', () => {
 
   const skillCones = {
     item: {
-      title: 'Skill cones',
+      title: 'Skill',
       description: 'skillCone',
       endpoint: 'skill/cone/',
       selectionRef: 'skillCone',

src/Components/SkillCodeList/__snapshots__/SkillCodeList.test.jsx.snap

@@ -8,7 +8,7 @@ exports[`SkillCodeList matches snapshot with an array of three items 1`] = `
 
 exports[`SkillCodeList matches snapshot with an empty array 1`] = `
 <span>
-  No Skill codes listed
+  No Skills listed
 </span>
 `;
 

src/Constants/BidCountDefinitions.js

@@ -1,8 +1,8 @@
 const BID_COUNT_DEFINITIONS = {
   totalBids: { title: 'Total bids', definition: 'Number of bids on this position.' },
   inGradeBids: { title: 'In-grade bids', definition: 'Number of bidders who are at Grade.' },
-  atSkillBids: { title: 'At-skill bids', definition: 'Number of bidders who are at Skill code.' },
-  inGradeAtSkillBids: { title: 'In-grade and at-skill bids', definition: 'Number of bidders who are at Grade and Skill code.' },
+  atSkillBids: { title: 'At-skill bids', definition: 'Number of bidders who are at Skill.' },
+  inGradeAtSkillBids: { title: 'In-grade and at-skill bids', definition: 'Number of bidders who are at Grade and Skill.' },
 };
 
 export default BID_COUNT_DEFINITIONS;

src/Constants/SystemMessages.js

@@ -28,7 +28,7 @@ export const NO_SAVED_SEARCHES = 'You do not have any saved searches.';
 export const NO_SKILL = DEFAULT_TEXT;
 export const NO_TOUR_OF_DUTY = DEFAULT_TEXT;
 export const NO_USER_LISTED = DEFAULT_TEXT;
-export const NO_USER_SKILL_CODE = 'No Skill codes listed';
+export const NO_USER_SKILL_CODE = 'No Skills listed';
 
 export const GENERAL_SAVED_SEARCH_ERROR = 'An error occurred trying to save this search.';
 

src/Containers/Home/items.json

@@ -1,8 +1,8 @@
 [
   {
-    "title": "Skill code",
+    "title": "Skill",
     "selectionRef": "skill",
-    "text": "Choose Skill codes",
+    "text": "Choose Skill",
     "choices": [
       { "code": 1, "description": "accounting" },
       { "code": 2, "description": "economics" },

src/actions/filters/filters.test.js

@@ -7,12 +7,12 @@ const { mockStore, mockAdapter } = setupAsyncMocks();
 const items = {
   filters: [
     { item: {
-      title: 'Skill code',
+      title: 'Skill',
       sort: 100,
       description: 'skill',
       endpoint: 'skill/',
       selectionRef: 'skill__code__in',
-      text: 'Choose Skill codes',
+      text: 'Choose Skill',
     },
       data: [
       ],

src/reducers/filters/filters.js

@@ -18,12 +18,12 @@ const items =
       },
       {
         item: {
-          title: 'Skill Cone (Code)',
+          title: 'Skill',
           sort: 200,
           description: 'skill',
           endpoint: 'skill/',
           selectionRef: ENDPOINT_PARAMS.skill,
-          text: 'Choose Skill codes',
+          text: 'Choose Skills',
         },
         data: [
         ],

src/sass/_results.scss

@@ -492,7 +492,7 @@ $results-container-width: 100% - $filter-container-width;
   }
 
   .accordion-checkbox-post,
-  .accordion-checkbox-skill-cone-code {
+  .accordion-checkbox-skill {
     .usa-accordion-button {
       float: left;
       padding-left: 0;
@@ -511,7 +511,7 @@ $results-container-width: 100% - $filter-container-width;
     min-height: 220px;
   }
 
-  .accordion-checkbox-skill-cone-code,
+  .accordion-checkbox-skill,
   .accordion-checkbox-post,
   .accordion-checkbox-bureau {
     padding: 0;