fix subject urls

Author: samuelcolvin

src/components/contractors/ConModal.js

@@ -9,6 +9,7 @@ const TRANSITION_TIME = 500
 class ConModal extends Component {
   constructor (props) {
     super(props)
+    this.con_id = parseInt(this.props.id, 10)
     this.state = {
       show_enquiry: false,
       transition_class: ''
@@ -19,7 +20,7 @@ class ConModal extends Component {
 
   get_contractor () {
     for (let contractor of this.props.contractors) {
-      if (contractor.link === this.props.con_link) {
+      if (contractor.id === this.con_id) {
         return {contractor, contractor_extra: this.props.get_contractor_details(contractor)}
       }
     }

src/components/contractors/Contractors.js

@@ -31,7 +31,7 @@ class Contractors extends Component {
 
   subject_change (selected_subject) {
     if (selected_subject) {
-      this.props.history.push(this.props.root.url(`subject/${slugify(selected_subject.name)}`))
+      this.props.history.push(this.props.root.url(`subject/${selected_subject.id}-${slugify(selected_subject.name)}`))
     } else {
       this.props.history.push(this.props.root.url(''))
     }
@@ -40,10 +40,10 @@ class Contractors extends Component {
 
   async update_contractors (selected_subject) {
     if (!selected_subject) {
-      const m = this.props.history.location.pathname.match(/subject\/([^/]+)/)
-      const subject_slug = m ? m[1] : null
-      if (subject_slug && this.state.subjects.length > 0) {
-        selected_subject = this.state.subjects.find(s => slugify(s.name) === subject_slug)
+      const m = this.props.history.location.pathname.match(/subject\/(\d+)/)
+      const subject_id = m ? parseInt(m[1], 10) : null
+      if (subject_id && this.state.subjects.length > 0) {
+        selected_subject = this.state.subjects.find(s => s.id === subject_id)
       }
     }
 
@@ -84,8 +84,8 @@ class Contractors extends Component {
               subject_change={this.subject_change}
               root={this.props.root}/>
 
-        <Route path={this.props.root.url(':con([0-9]+-.+)')} render={props => (
-          <ConModal con_link={props.match.params.con}
+        <Route path={this.props.root.url(':id(\\d+):_extra')} render={props => (
+          <ConModal id={props.match.params.id}
                     contractors={this.state.contractors}
                     got_contractors={this.state.got_contractors}
                     get_contractor_details={this.get_contractor_details}

src/utils.js

@@ -16,9 +16,13 @@ export const to_markdown = t => {
 
 export const auto_url_root = path => {
   // remove :
+  // * /subject/.*
   // * contractor slug
   // * /enquiry
-  path = path.replace(/\/\d+-[\w-]+$/, '/').replace(/\/enquiry$/, '/')
+  path = path
+    .replace(/\/subject\/\d+-[^/]+$/, '/')
+    .replace(/\/\d+-[^/]+$/, '/')
+    .replace(/\/enquiry$/, '/')
   return path
 }