refactor: remove dasherize (#50620)

freeCodeCamp · Jun 8, 2023 · 167a8e7 · 167a8e7
1 parent 2f9ce8d
commit 167a8e7
Show file tree

Hide file tree

Showing 48 changed files with 115 additions and 180 deletions.
diff --git a/.gitignore b/.gitignore
@@ -170,10 +170,6 @@ config/superblocks.js
 config/superblocks.test.js
 
 ### Generated utils files ###
-utils/block-nameify.js
-utils/block-nameify.test.js
-utils/slugs.js
-utils/slugs.test.js
 utils/index.js
 utils/get-lines.js
 utils/get-lines.test.js

diff --git a/.prettierignore b/.prettierignore
@@ -12,10 +12,6 @@ config/certification-settings.js
 config/donation-settings.js
 config/superblocks.js
 config/superblocks.test.js
-utils/block-nameify.js
-utils/block-nameify.test.js
-utils/slugs.js
-utils/slugs.test.js
 utils/index.js
 utils/get-lines.js
 utils/get-lines.test.js

diff --git a/client/gatsby-node.js b/client/gatsby-node.js
@@ -77,6 +77,7 @@ exports.createPages = function createPages({ graphql, actions, reporter }) {
                   block
                   certification
                   challengeType
+                  dashedName
                   fields {
                     slug
                   }

diff --git a/client/src/templates/Challenges/components/completion-modal.tsx b/client/src/templates/Challenges/components/completion-modal.tsx
@@ -8,7 +8,6 @@ import { withTranslation } from 'react-i18next';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 
-import { dasherize } from '../../../../../utils/slugs';
 import Login from '../../../components/Header/components/login';
 import { executeGA } from '../../../redux/actions';
 import {
@@ -40,15 +39,15 @@ const mapStateToProps = createSelector(
 
   (
     challengeFiles: ChallengeFiles,
-    { title }: { title: string; id: string },
+    { dashedName }: { dashedName: string },
     completedChallengesIds: string[],
     isOpen: boolean,
     isSignedIn: boolean,
     allChallengesInfo: AllChallengesInfo,
     message: string
   ) => ({
     challengeFiles,
-    title,
+    dashedName,
     completedChallengesIds,
     isOpen,
     isSignedIn,
@@ -144,16 +143,20 @@ class CompletionModal extends Component<
   }
 
   render(): JSX.Element {
-    const { close, isOpen, isSignedIn, message, t, title, submitChallenge } =
-      this.props;
+    const {
+      close,
+      isOpen,
+      isSignedIn,
+      message,
+      t,
+      dashedName,
+      submitChallenge
+    } = this.props;
 
     if (isOpen) {
       executeGA({ event: 'pageview', pagePath: '/completion-modal' });
     }
-    // normally dashedName should be graphQL queried and then passed around,
-    // but it's only used to make a nice filename for downloading, so dasherize
-    // is fine here.
-    const dashedName = dasherize(title);
+
     return (
       <Modal
         animation={false}

diff --git a/client/src/utils/get-completion-percentage.ts b/client/src/utils/get-completion-percentage.ts
@@ -1,5 +1,4 @@
 import { AllChallengesInfo } from '../redux/prop-types';
-import { dasherize } from '../../../utils/slugs';
 import { isFinalProject } from '../../utils/challenge-types';
 
 export function getCompletedPercentage(
@@ -43,9 +42,7 @@ export const getCurrentBlockIds = (
   const { challengeEdges, certificateNodes } = allChallengesInfo;
   const currentCertificateIds =
     certificateNodes
-      .filter(
-        node => dasherize(node.challenge.certification) === certification
-      )[0]
+      .filter(node => node.challenge.certification === certification)[0]
       ?.challenge.tests.map(test => test.id) ?? [];
   const currentBlockIds = challengeEdges
     .filter(edge => edge.node.challenge.block === block)

diff --git a/client/utils/gatsby/challenge-page-creator.js b/client/utils/gatsby/challenge-page-creator.js
@@ -1,5 +1,4 @@
 const path = require('path');
-const { dasherize } = require('../../../utils/slugs');
 const { sortChallengeFiles } = require('../../../utils/sort-challengefiles');
 const { challengeTypes, viewTypes } = require('../challenge-types');
 
@@ -79,6 +78,7 @@ function getTemplateComponent(challengeType) {
 exports.createChallengePages = function (createPage) {
   return function ({ node: { challenge } }, index, allChallengeEdges) {
     const {
+      dashedName,
       certification,
       superBlock,
       block,
@@ -96,6 +96,7 @@ exports.createChallengePages = function (createPage) {
       component: getTemplateComponent(challengeType),
       context: {
         challengeMeta: {
+          dashedName,
           certification,
           superBlock,
           block,
@@ -163,7 +164,7 @@ exports.createBlockIntroPages = function (createPage) {
       path: slug,
       component: intro,
       context: {
-        block: dasherize(block),
+        block,
         slug
       }
     });

diff --git a/curriculum/challenges/_meta/build-a-caesars-cipher-project/meta.json b/curriculum/challenges/_meta/build-a-caesars-cipher-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Caesars Cipher Project",
   "isUpcomingChange": true,
+  "dashedName": "build-a-caesars-cipher-project",
   "usesMultifileEditor": false,
   "helpCategory": "JavaScript",
   "order": 17,
@@ -14,4 +15,4 @@
       "Build a Caesars Cipher"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-cash-register-project/meta.json b/curriculum/challenges/_meta/build-a-cash-register-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Cash Register Project",
   "isUpcomingChange": true,
+  "dashedName": "build-a-cash-register-project",
   "usesMultifileEditor": false,
   "helpCategory": "JavaScript",
   "order": 14,
@@ -14,4 +15,4 @@
       "Build a Cash Register"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-celestial-bodies-database-project/meta.json b/curriculum/challenges/_meta/build-a-celestial-bodies-database-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Celestial Bodies Database Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-celestial-bodies-database-project",
   "order": 2,
   "helpCategory": "Backend Development",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Celestial Bodies Database"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-data-graph-explorer-project/meta.json b/curriculum/challenges/_meta/build-a-data-graph-explorer-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Data Graph Explorer Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-data-graph-explorer-project",
   "order": 19,
   "helpCategory": "Python",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Data Graph Explorer"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-financial-calculator-project/meta.json b/curriculum/challenges/_meta/build-a-financial-calculator-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Financial Calculator Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-financial-calculator-project",
   "order": 17,
   "helpCategory": "Python",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Financial Calculator"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-graphing-calculator-project/meta.json b/curriculum/challenges/_meta/build-a-graphing-calculator-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Graphing Calculator Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-graphing-calculator-project",
   "order": 11,
   "helpCategory": "Python",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Graphing Calculator"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-multi-function-calculator-project/meta.json b/curriculum/challenges/_meta/build-a-multi-function-calculator-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Multi-Function Calculator Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-multi-function-calculator-project",
   "order": 6,
   "helpCategory": "Python",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Multi-Function Calculator"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-number-guessing-game-project/meta.json b/curriculum/challenges/_meta/build-a-number-guessing-game-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Number Guessing Game Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-number-guessing-game-project",
   "order": 13,
   "helpCategory": "Backend Development",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Number Guessing Game"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-palindrome-checker-project/meta.json b/curriculum/challenges/_meta/build-a-palindrome-checker-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Palindrome Checker Project",
   "isUpcomingChange": true,
+  "dashedName": "build-a-palindrome-checker-project",
   "usesMultifileEditor": false,
   "helpCategory": "JavaScript",
   "order": 3,
@@ -14,4 +15,4 @@
       "Build a Palindrome Checker"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-periodic-table-database-project/meta.json b/curriculum/challenges/_meta/build-a-periodic-table-database-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Periodic Table Database Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-periodic-table-database-project",
   "order": 12,
   "helpCategory": "Backend Development",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Periodic Table Database"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-personal-portfolio-webpage-project/meta.json b/curriculum/challenges/_meta/build-a-personal-portfolio-webpage-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Personal Portfolio Webpage Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-personal-portfolio-webpage-project",
   "usesMultifileEditor": true,
   "helpCategory": "HTML-CSS",
   "order": 19,
@@ -14,4 +15,4 @@
       "Build a Personal Portfolio Webpage"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-product-landing-page-project/meta.json b/curriculum/challenges/_meta/build-a-product-landing-page-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Product Landing Page Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-product-landing-page-project",
   "usesMultifileEditor": true,
   "helpCategory": "HTML-CSS",
   "order": 16,
@@ -14,4 +15,4 @@
       "Build a Product Landing Page"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-roman-numeral-converter-project/meta.json b/curriculum/challenges/_meta/build-a-roman-numeral-converter-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Roman Numeral Converter Project",
   "isUpcomingChange": true,
+  "dashedName": "build-a-roman-numeral-converter-project",
   "usesMultifileEditor": false,
   "helpCategory": "JavaScript",
   "order": 6,
@@ -14,4 +15,4 @@
       "Build a Roman Numeral Converter"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-salon-appointment-scheduler-project/meta.json b/curriculum/challenges/_meta/build-a-salon-appointment-scheduler-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Salon Appointment Scheduler Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-salon-appointment-scheduler-project",
   "order": 9,
   "helpCategory": "Backend Development",
   "time": "30 hours",
@@ -13,4 +14,4 @@
       "Build a Salon Appointment Scheduler"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-survey-form-project/meta.json b/curriculum/challenges/_meta/build-a-survey-form-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Survey Form Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-survey-form-project",
   "usesMultifileEditor": true,
   "helpCategory": "HTML-CSS",
   "order": 4,
@@ -14,4 +15,4 @@
       "Build a Survey Form"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-technical-documentation-page-project/meta.json b/curriculum/challenges/_meta/build-a-technical-documentation-page-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Technical Documentation Page Project",
   "isUpcomingChange": false,
+  "dashedName": "build-a-technical-documentation-page-project",
   "usesMultifileEditor": true,
   "helpCategory": "HTML-CSS",
   "order": 13,
@@ -14,4 +15,4 @@
       "Build a Technical Documentation Page"
     ]
   ]
-}
+}
diff --git a/curriculum/challenges/_meta/build-a-telephone-number-validator-project/meta.json b/curriculum/challenges/_meta/build-a-telephone-number-validator-project/meta.json
@@ -1,6 +1,7 @@
 {
   "name": "Build a Telephone Number Validator Project",
   "isUpcomingChange": true,
+  "dashedName": "build-a-telephone-number-validator-project",
   "usesMultifileEditor": false,
   "helpCategory": "JavaScript",
   "order": 10,
@@ -14,4 +15,4 @@
       "Build a Telephone Number Validator"
     ]
   ]
-}
+}