Merge pull request #412 from decentraland/fix/prefixed-links

fix: Prefixed links
decentraland · Nov 29, 2023 · ee4cdb9 · ee4cdb9
2 parents 08be619 + 69d7e75
commit ee4cdb9
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "caniuse-lite": "^1.0.30001470",
     "core-js": "^3.22.2",
     "cssnano": "^5.0.10",
-    "decentraland-gatsby": "^5.92.0",
+    "decentraland-gatsby": "^5.96.0",
     "es6-shim": "^0.35.6",
     "express-fileupload": "^1.2.1",
     "gatsby": "4.23.0",

diff --git a/src/components/Layout/OverviewList.tsx b/src/components/Layout/OverviewList.tsx
@@ -1,5 +1,7 @@
 import React from "react"
 
+import { withPrefix } from "gatsby"
+
 import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
@@ -83,7 +85,7 @@ export default React.memo(function OverviewList(props: OverviewListProps) {
               <Button
                 basic
                 as="a"
-                href={props.href}
+                href={withPrefix(props.href)}
                 onClick={(e) => {
                   e.preventDefault()
                   navigate(props.href)

diff --git a/src/components/Place/PlaceCard/PlaceCard.tsx b/src/components/Place/PlaceCard/PlaceCard.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback, useContext, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import ImgFixed from "decentraland-gatsby/dist/components/Image/ImgFixed"
 import useTrackContext from "decentraland-gatsby/dist/context/Track/useTrackContext"
 import useTrackLinkContext from "decentraland-gatsby/dist/context/Track/useTrackLinkContext"
@@ -109,10 +111,18 @@ export default React.memo(function PlaceCard(props: PlaceCardProps) {
         </div>
       </Link>
       <Card.Content>
-        <Card.Header as="a" href={href} onClick={handleClickCard}>
+        <Card.Header
+          as="a"
+          href={href ? withPrefix(href) : href}
+          onClick={handleClickCard}
+        >
           {place?.title || " "}
         </Card.Header>
-        <Card.Meta as="a" href={href} onClick={handleClickCard}>
+        <Card.Meta
+          as="a"
+          href={href ? withPrefix(href) : href}
+          onClick={handleClickCard}
+        >
           {place?.contact_name || " "}
         </Card.Meta>
         {false && (

diff --git a/src/components/Place/PlaceDetails/PlaceDetails.tsx b/src/components/Place/PlaceDetails/PlaceDetails.tsx
@@ -10,7 +10,7 @@ import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import { SceneContentRating } from "decentraland-gatsby/dist/utils/api/Catalyst.types"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
 import { Tabs } from "decentraland-ui/dist/components/Tabs/Tabs"
-import { intersects } from "radash/dist/array"
+import { intersects } from "radash"
 import rehypeSanitize from "rehype-sanitize"
 import remarkGfm from "remark-gfm"
 import Icon from "semantic-ui-react/dist/commonjs/elements/Icon"

diff --git a/src/components/Place/PlaceFeatured/PlaceFeatured.tsx b/src/components/Place/PlaceFeatured/PlaceFeatured.tsx
@@ -1,5 +1,7 @@
 import React, { useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import useTrackLinkContext from "decentraland-gatsby/dist/context/Track/useTrackLinkContext"
 import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl/utils"
@@ -51,7 +53,7 @@ export default React.memo(function PlaceFeatured(props: PlaceFeaturedProps) {
           <Button
             primary
             as="a"
-            href={placeJumpInUrl}
+            href={withPrefix(placeJumpInUrl)}
             onClick={handleJumpInTrack}
             target="_blank"
             data-event={SegmentPlace.JumpIn}
@@ -64,7 +66,7 @@ export default React.memo(function PlaceFeatured(props: PlaceFeaturedProps) {
           <Button
             secondary
             as="a"
-            href={placeDetailUrl}
+            href={withPrefix(placeDetailUrl)}
             onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
               e.preventDefault()
               placeDetailUrl && navigate(placeDetailUrl)

diff --git a/src/entities/Place/model.ts b/src/entities/Place/model.ts
@@ -15,7 +15,7 @@ import {
   values,
 } from "decentraland-gatsby/dist/entities/Database/utils"
 import { numeric, oneOf } from "decentraland-gatsby/dist/entities/Schema/utils"
-import { diff, unique } from "radash/dist/array"
+import { diff, unique } from "radash"
 import isEthereumAddress from "validator/lib/isEthereumAddress"
 
 import PlaceCategories from "../PlaceCategories/model"

diff --git a/src/entities/Place/routes/getPlaceMostActiveList.ts b/src/entities/Place/routes/getPlaceMostActiveList.ts
@@ -7,7 +7,7 @@ import {
   numeric,
   oneOf,
 } from "decentraland-gatsby/dist/entities/Schema/utils"
-import { flat, sort } from "radash/dist/array"
+import { flat, sort } from "radash"
 
 import { getHotScenes } from "../../../modules/hotScenes"
 import { getSceneStats } from "../../../modules/sceneStats"

diff --git a/src/entities/Place/routes/getPlaceUserVisitsList.ts b/src/entities/Place/routes/getPlaceUserVisitsList.ts
@@ -3,7 +3,7 @@ import Context from "decentraland-gatsby/dist/entities/Route/wkc/context/Context
 import ApiResponse from "decentraland-gatsby/dist/entities/Route/wkc/response/ApiResponse"
 import Router from "decentraland-gatsby/dist/entities/Route/wkc/routes/Router"
 import { bool, numeric } from "decentraland-gatsby/dist/entities/Schema/utils"
-import { sort } from "radash/dist/array"
+import { sort } from "radash"
 
 import { getHotScenes } from "../../../modules/hotScenes"
 import { getSceneStats } from "../../../modules/sceneStats"

diff --git a/src/entities/Report/routes.ts b/src/entities/Report/routes.ts
@@ -4,7 +4,7 @@ import Context from "decentraland-gatsby/dist/entities/Route/wkc/context/Context
 import ApiResponse from "decentraland-gatsby/dist/entities/Route/wkc/response/ApiResponse"
 import routes from "decentraland-gatsby/dist/entities/Route/wkc/routes"
 import env from "decentraland-gatsby/dist/utils/env"
-import { retry } from "radash/dist/async"
+import { retry } from "radash"
 
 import { extension } from "./util"
 

diff --git a/src/modules/entityScene.ts b/src/modules/entityScene.ts
@@ -3,7 +3,7 @@ import Catalyst, {
   ContentEntityScene,
 } from "decentraland-gatsby/dist/utils/api/Catalyst"
 import Time from "decentraland-gatsby/dist/utils/date/Time"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 const loader = new DataLoader(
   async function (

diff --git a/src/modules/pois.ts b/src/modules/pois.ts
@@ -1,6 +1,6 @@
 import Time from "decentraland-gatsby/dist/utils/date/Time"
 import env from "decentraland-gatsby/dist/utils/env"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 const DCL_LIST_URL = env(
   `GATSBY_DCL_LIST_URL`,

diff --git a/src/modules/sceneStats.ts b/src/modules/sceneStats.ts
@@ -1,5 +1,5 @@
 import Time from "decentraland-gatsby/dist/utils/date/Time"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 import DataTeam from "../api/DataTeam"
 

diff --git a/src/modules/worldsLiveData.ts b/src/modules/worldsLiveData.ts
@@ -1,6 +1,6 @@
 import Time from "decentraland-gatsby/dist/utils/date/Time"
 import fetch from "node-fetch"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 export type WorldLivePerWorldProps = {
   users: number

diff --git a/src/pages/favorites/index.tsx b/src/pages/favorites/index.tsx
@@ -17,7 +17,7 @@ import { Container } from "decentraland-ui/dist/components/Container/Container"
 import { Header } from "decentraland-ui/dist/components/Header/Header"
 import { HeaderMenu } from "decentraland-ui/dist/components/HeaderMenu/HeaderMenu"
 import { SignIn } from "decentraland-ui/dist/components/SignIn/SignIn"
-import { cluster } from "radash/dist/array"
+import { cluster } from "radash"
 import Icon from "semantic-ui-react/dist/commonjs/elements/Icon"
 
 import Navigation, { NavigationTab } from "../../components/Layout/Navigation"

diff --git a/src/pages/place.tsx b/src/pages/place.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react"
 
+import { withPrefix } from "gatsby"
 import { Helmet } from "react-helmet"
 
 import { useLocation } from "@gatsbyjs/reach-router"
@@ -102,7 +103,8 @@ export default function PlacePage() {
         share({
           title: place.title || undefined,
           text: `${l("general.place_share")}${shareableText}`,
-          url: location.origin + locations.place(place.base_position),
+          url:
+            location.origin + withPrefix(locations.place(place.base_position)),
           thumbnail: place.image || undefined,
         })
       }