Merge pull request #92 from PDCMFinder/dev

Update main to use new Details URLs
PDCMFinder · May 31, 2022 · 911f939 · 911f939
2 parents 834e23c + 9506ca4
commit 911f939
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/k8-deploy/nodeport_deploy/dev/ingress-dev.yaml b/k8-deploy/nodeport_deploy/dev/ingress-dev.yaml
@@ -15,5 +15,5 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: pdcm-web-ui-dev-ingress-service
+              serviceName: pdcm-web-ui-dev-service
               servicePort: 80
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "react": "^17.0.2",
     "react-bootstrap": "2.2.2",
     "react-bootstrap-drawer": "^1.0.0",
-    "react-bootstrap-typeahead": "6.0.0-alpha.11",
+    "react-bootstrap-typeahead": "6.0.0-alpha.12",
     "react-cookie-consent": "^6.4.1",
     "react-csv": "^2.2.1",
     "react-dom": "^17.0.2",

diff --git a/src/Routes.ts b/src/Routes.ts
@@ -9,7 +9,7 @@ export const routes = [
   { path: "/data", name: "Data" },
   { path: "/data/search", name: "Search" },
   {
-    path: "/data/:providerId/:modelId/",
+    path: "/data/models/:providerId/:modelId/",
     name: "Details",
   },
   {

diff --git a/src/components/search/SearchResultCard.tsx b/src/components/search/SearchResultCard.tsx
@@ -96,7 +96,7 @@ export const SearchResultCard: React.FC<SearchResult> = ({
       <Card.Body className="m-2">
         <Row>
           <Col xs={12} sm={12} md={6} lg={4}>
-            <Link to={`/data/${sourceId}/${pdcmId}`}>
+            <Link to={`/data/models/${sourceId}/${pdcmId}`}>
               <h4 className="fw-light">
                 {sourceId} / {pdcmId}
               </h4>

diff --git a/yarn.lock b/yarn.lock
@@ -14275,10 +14275,10 @@ react-bootstrap-drawer@^1.0.0:
   resolved "https://registry.yarnpkg.com/react-bootstrap-drawer/-/react-bootstrap-drawer-1.0.0.tgz#32315c51a88e49b06c601c6f622a9d2230f8d1db"
   integrity sha512-H6YMnENP+FNTXajQKoPDkYE8mNgJQk2Es86c4ZZzdqTwjeRkQSwstItqa4OtFblV6gFAw2uY3T55E0MdRDciDg==
 
-react-bootstrap-typeahead@6.0.0-alpha.9:
-  version "6.0.0-alpha.9"
-  resolved "https://registry.yarnpkg.com/react-bootstrap-typeahead/-/react-bootstrap-typeahead-6.0.0-alpha.9.tgz#257955d1372fc2e1138254d19b618fd6761c3ef6"
-  integrity sha512-7/fYZeon84423Y3qKx+YrwEyG427zJ3iApGSQeBNCXovdKowVDf5LdEK/KZ1UPAWsKeVpRTOEr8qLtGYUvL7OQ==
+react-bootstrap-typeahead@6.0.0-alpha.12:
+  version "6.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/react-bootstrap-typeahead/-/react-bootstrap-typeahead-6.0.0-alpha.12.tgz#645349a82f55b1a2f718ee9a88eeb2a136cbedc7"
+  integrity sha512-8ad+tIqlJaSCChj2ZhQxMerPNqT7M/wI7w/OcPLyuBNAyYSxzcH9CaAZkFM1gzvsKhwc8txQh0g85sFusNe9sg==
   dependencies:
     "@babel/runtime" "^7.14.6"
     "@popperjs/core" "^2.10.2"