From 1e0283ac25bdd5667d44812ab640d0041c025f2b Mon Sep 17 00:00:00 2001 From: Lautaro Petaccio <1120791+LautaroPetaccio@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:43:13 -0300 Subject: [PATCH 1/3] feat: Make the builder router work with the builder basename (#2985) * feat: Enable the builder to be single site * fix: Move config up --- .../NameTabs/NameTabs.spec.tsx | 1 - src/config/env/dev.json | 7 ++++--- src/config/env/stg.json | 7 ++++--- src/index.tsx | 2 +- src/modules/common/store.ts | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/components/WorldListPage_WorldsForEnsOwnersFeature/NameTabs/NameTabs.spec.tsx b/src/components/WorldListPage_WorldsForEnsOwnersFeature/NameTabs/NameTabs.spec.tsx index 522ab8072..c4107dac9 100644 --- a/src/components/WorldListPage_WorldsForEnsOwnersFeature/NameTabs/NameTabs.spec.tsx +++ b/src/components/WorldListPage_WorldsForEnsOwnersFeature/NameTabs/NameTabs.spec.tsx @@ -1,6 +1,5 @@ import { ReactNode } from 'react' import { render, screen } from '@testing-library/react' -import '@testing-library/jest-dom' import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media' import NameTabs from './NameTabs' import { TAB_QUERY_PARAM_KEY, TabType, UseCurrentlySelectedTabResult, useCurrentlySelectedTab } from '../hooks' diff --git a/src/config/env/dev.json b/src/config/env/dev.json index 687eb6dff..90c28ae73 100644 --- a/src/config/env/dev.json +++ b/src/config/env/dev.json @@ -1,13 +1,14 @@ { "CHAIN_ID": "11155111", "ENVIRONMENT": "development", + "BASE_NAME": "/builder", "LOCAL_STORAGE_KEY": "builder", "EMAIL_SERVER_URL": "https://subscription.decentraland.org/subscribe", "PEER_URL": "https://peer.decentraland.zone", "ERC721_COLLECTION_BASE_URI": "https://peer.decentraland.zone/lambdas/collections/standard/erc721/", "BUILDER_SERVER_URL": "https://builder-api.decentraland.zone/v1", "MARKETPLACE_URL": "https://api.decentraland.zone/v1", - "MARKETPLACE_WEB_URL": "https://market.decentraland.zone", + "MARKETPLACE_WEB_URL": "https://decentraland.zone/marketplace", "LAND_MANAGER_GRAPH_URL": "https://api.studio.thegraph.com/query/49472/land-manager-sepolia/version/latest", "MARKETPLACE_GRAPH_URL": "https://api.studio.thegraph.com/query/49472/marketplace-sepolia/version/latest", "RENTALS_GRAPH_URL": "https://api.studio.thegraph.com/query/49472/rentals-ethereum-sepolia/version/latest", @@ -27,13 +28,13 @@ "IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false", "EXPLORER_URL": "https://play.decentraland.zone", "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.zone/v1", - "ACCOUNT_URL": "https://account.decentraland.zone", + "ACCOUNT_URL": "https://decentraland.zone/account", "DISCORD_URL": "https://dcl.gg/discord", "WEARABLES_ZIP_INFRA_URL": "http://a-test-url-com", "MIN_SALE_VALUE_IN_WEI": "1000000000000000000", "FORUM_URL": "https://forum.decentraland.org", "WORLDS_CONTENT_SERVER": "https://worlds-content-server.decentraland.zone", - "PROFILE_URL": "https://profile.decentraland.zone", + "PROFILE_URL": "https://decentraland.zone/profile", "SSO_URL": "https://id.decentraland.zone", "SENTRY_DSN": "https://428e8d298fb3f0fbcea645314a4a388c@o4504361728212992.ingest.sentry.io/4505748381564928", "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.zone", diff --git a/src/config/env/stg.json b/src/config/env/stg.json index 338841410..fcb5b0eed 100644 --- a/src/config/env/stg.json +++ b/src/config/env/stg.json @@ -1,13 +1,14 @@ { "CHAIN_ID": "1", "ENVIRONMENT": "staging", + "BASE_NAME": "/builder", "LOCAL_STORAGE_KEY": "builder", "EMAIL_SERVER_URL": "https://subscription.decentraland.org/subscribe", "PEER_URL": "https://peer.decentraland.org", "ERC721_COLLECTION_BASE_URI": "https://peer.decentraland.org/lambdas/collections/standard/erc721/", "BUILDER_SERVER_URL": "https://builder-api.decentraland.today/v1", "MARKETPLACE_URL": "https://api.decentraland.org/v1", - "MARKETPLACE_WEB_URL": "https://market.decentraland.today", + "MARKETPLACE_WEB_URL": "https://decentraland.today/marketplace", "LAND_MANAGER_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/land-manager", "MARKETPLACE_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/marketplace", "RENTALS_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/rentals-ethereum-mainnet", @@ -27,13 +28,13 @@ "IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false", "EXPLORER_URL": "https://play.decentraland.org", "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.today/v1", - "ACCOUNT_URL": "https://account.decentraland.today", + "ACCOUNT_URL": "https://decentraland.today/account", "DISCORD_URL": "https://dcl.gg/discord", "WEARABLES_ZIP_INFRA_URL": "https://docs.decentraland.org/decentraland/linked-wearables/#creating-linked-wearables-in-bulk", "MIN_SALE_VALUE_IN_WEI": "1000000000000000000", "FORUM_URL": "https://forum.decentraland.org", "WORLDS_CONTENT_SERVER": "https://worlds-content-server.decentraland.org", - "PROFILE_URL": "https://profile.decentraland.today", + "PROFILE_URL": "https://decentraland.today/profile", "SSO_URL": "https://id.decentraland.today", "SENTRY_DSN": "https://428e8d298fb3f0fbcea645314a4a388c@o4504361728212992.ingest.sentry.io/4505748381564928", "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.today", diff --git a/src/index.tsx b/src/index.tsx index 0a7e1a5eb..a026dcfcb 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -10,9 +10,9 @@ import TranslationProvider from 'decentraland-dapps/dist/providers/TranslationPr import WalletProvider from 'decentraland-dapps/dist/providers/WalletProvider' import * as SingleSignOn from '@dcl/single-sign-on-client' +import { config } from 'config' import { store, history } from 'modules/common/store' import * as modals from 'components/Modals' -import { config } from 'config' import * as languages from 'modules/translation/languages' import Routes from 'routing' diff --git a/src/modules/common/store.ts b/src/modules/common/store.ts index c395c5776..01ecefcda 100644 --- a/src/modules/common/store.ts +++ b/src/modules/common/store.ts @@ -62,7 +62,7 @@ const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ }) : compose -const history = createBrowserHistory() +const history = createBrowserHistory({ basename: config.get('BASE_NAME') ?? undefined }) const rootReducer = createRootReducer(history) const historyMiddleware = routerMiddleware(history) From ee5e2fb19c727c46525f224b5ea985818039993a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20D=C3=ADaz?= Date: Mon, 20 Nov 2023 18:38:32 -0300 Subject: [PATCH 2/3] feat: Send projectId to the inspector (#2984) * feat: Send projectId to the inspector * chore: Upgrade @dcl/sdk package --- package-lock.json | 142 +++++++++--------- package.json | 2 +- .../InspectorPage/InspectorPage.container.ts | 2 + .../InspectorPage/InspectorPage.tsx | 6 +- .../InspectorPage/InspectorPage.types.ts | 4 +- 5 files changed, 82 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20845f768..7f921456a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@dcl/hashing": "^3.0.4", "@dcl/mini-rpc": "^1.0.7", "@dcl/schemas": "^9.4.1", - "@dcl/sdk": "7.3.28", + "@dcl/sdk": "7.3.29", "@dcl/single-sign-on-client": "^0.1.0", "@dcl/ui-env": "^1.2.0", "@sentry/react": "^7.64.0", @@ -2290,9 +2290,9 @@ } }, "node_modules/@dcl/ecs": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/ecs/-/ecs-7.3.28.tgz", - "integrity": "sha512-Tj66GmZAeePhGI3mCvbTTdVL0lQqunUMAo1ZGcvZ5eiq+BAeySaAQve+cWJ6f1q3Nn92R9br6wjQX/VEG7bfgA==" + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/ecs/-/ecs-7.3.29.tgz", + "integrity": "sha512-JPX0OiVCqs1BgXHi7wUpXjTlnv0wlOU2VN6BJFDgwbz/cBLDnxkBAZI4/iWXl+mzUY3CMSM9Prt1hfj+NYkhIA==" }, "node_modules/@dcl/ecs-math": { "version": "2.0.2", @@ -2310,17 +2310,17 @@ "integrity": "sha512-Cg+MoIOn+BYmQV2q8zSFnNYY+GldlnUazwBnfgrq3i66ZxOaZ65h01btd8OUtSAlfWG4VTNIOHDjtKqmuwJNBg==" }, "node_modules/@dcl/inspector": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/inspector/-/inspector-7.3.28.tgz", - "integrity": "sha512-avLzmc4Om1qLWR+hVNgefOmBDtjn8iJYLbYf4ZUWe6OToOc2eSP4UVF72KJRU/xx5O0tnP1KP/OISA10MYxaOA==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/inspector/-/inspector-7.3.29.tgz", + "integrity": "sha512-Qvs5OkgAOYB2y/VtCNsMnIanCuIoZRldi8h/gG6I52jhyxe7kUfWN4HaJUUwVhFTN8/hDrqxtPEMDeE2GOA2Sw==", "dependencies": { "@dcl/asset-packs": "^1.2.8" } }, "node_modules/@dcl/js-runtime": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/js-runtime/-/js-runtime-7.3.28.tgz", - "integrity": "sha512-xkvPXkwctBiJS3ZwQh8KLk4QiAN03KJHiGTyc5pwPhM/Xlufq4h6kagjCDu6V6SLBoJ/cMetB53ukjQn46ctBA==" + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/js-runtime/-/js-runtime-7.3.29.tgz", + "integrity": "sha512-bb1RORbWNURnxphK4wpI3FkhPFb+w3ri9exp39w2H3mkjWfG2YXe0QuMu4oyHE0ERd7ZnFHfaRcjUGsws4hyjQ==" }, "node_modules/@dcl/kernel": { "version": "1.0.0-2505075507.commit-6af9c3b", @@ -2436,11 +2436,11 @@ "integrity": "sha512-IPB043+NbQB3om2FlmQGmaRxTokHaSM9o3a7sEL0yJgBb60mukCpMdNXxzdIcemixfV3EhIJQ2G8HgK30XKTkA==" }, "node_modules/@dcl/react-ecs": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/react-ecs/-/react-ecs-7.3.28.tgz", - "integrity": "sha512-e2OupSQxI0w19xJrrzLSHkgJ55HNC0dxRLSWI5nVTexVEyMAms8YqDO+LABNpbFpEKzPMoyFECni7Lo5yVLRgg==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/react-ecs/-/react-ecs-7.3.29.tgz", + "integrity": "sha512-LWTOxdi88IHnnI8FSjgEjxthMwRdWRV37fwoU8jWp7J/xbVkT2+/Hckrm7yd8Q/tHVmdSSiFcicuMiAA8LxYXQ==", "dependencies": { - "@dcl/ecs": "7.3.28", + "@dcl/ecs": "7.3.29", "react": "^18.2.0", "react-reconciler": "^0.29.0" } @@ -2507,28 +2507,28 @@ } }, "node_modules/@dcl/sdk": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/sdk/-/sdk-7.3.28.tgz", - "integrity": "sha512-ZcDV1ap7HvdaKoz3CuRk9WR+vFLGxx7lISZ2b2YyupQk7MJWAZuchImZrn66q6glChdq/H2ozZzsgwkesOjsdQ==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/sdk/-/sdk-7.3.29.tgz", + "integrity": "sha512-6nImr/r036ooT1JDvSvUUYL5K3BpOnkgNWkFE7nwnKKpqiHM9BBr499g9DqbuMEhmzMqQKmaesu8cruj2TYSiA==", "dependencies": { - "@dcl/ecs": "7.3.28", + "@dcl/ecs": "7.3.29", "@dcl/ecs-math": "2.0.2", "@dcl/explorer": "1.0.155192-20231106164658.commit-e3ed246", - "@dcl/js-runtime": "7.3.28", - "@dcl/react-ecs": "7.3.28", - "@dcl/sdk-commands": "7.3.28", + "@dcl/js-runtime": "7.3.29", + "@dcl/react-ecs": "7.3.29", + "@dcl/sdk-commands": "7.3.29", "text-encoding": "0.7.0" } }, "node_modules/@dcl/sdk-commands": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/sdk-commands/-/sdk-commands-7.3.28.tgz", - "integrity": "sha512-m0eGMV1jbthogjyXC7CaZMgtAAuFvNGiXhHabC5re5La/EEzGhjAaT+NuDH9TADjPfQRYRtIq8IVT7dKTdsh9Q==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/sdk-commands/-/sdk-commands-7.3.29.tgz", + "integrity": "sha512-3XR/XCzHWcHpXX8vbWoC0iCwXUs4Rgh3YdGAwiTShZ8Fm4jTVy/pZVQVNW94ijN0s1XJ25ZJqJUMHoc0lqsM+Q==", "dependencies": { "@dcl/crypto": "^3.4.4", - "@dcl/ecs": "7.3.28", + "@dcl/ecs": "7.3.29", "@dcl/hashing": "1.1.3", - "@dcl/inspector": "7.3.28", + "@dcl/inspector": "7.3.29", "@dcl/linker-dapp": "^0.11.0", "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be", "@dcl/protocol": "1.0.0-6721819745.commit-dd7b9dc", @@ -2536,7 +2536,7 @@ "@dcl/quests-manager": "^0.1.4", "@dcl/rpc": "^1.1.1", "@dcl/schemas": "^8.2.3-20230718182824.commit-356025c", - "@segment/analytics-node": "^1.0.0-beta.22", + "@segment/analytics-node": "^1.1.3", "@well-known-components/env-config-provider": "^1.2.0", "@well-known-components/fetch-component": "^2.0.2", "@well-known-components/http-server": "^2.0.0-20230501134558.commit-be9a25d", @@ -2684,9 +2684,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/@dcl/sdk-commands/node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4015,9 +4015,9 @@ } }, "node_modules/@fastify/busboy": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", - "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", + "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==", "engines": { "node": ">=14" } @@ -22332,9 +22332,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.3.tgz", + "integrity": "sha512-B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg==", "engines": { "node": "14 || >=16.14" } @@ -33934,9 +33934,9 @@ } }, "@dcl/ecs": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/ecs/-/ecs-7.3.28.tgz", - "integrity": "sha512-Tj66GmZAeePhGI3mCvbTTdVL0lQqunUMAo1ZGcvZ5eiq+BAeySaAQve+cWJ6f1q3Nn92R9br6wjQX/VEG7bfgA==" + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/ecs/-/ecs-7.3.29.tgz", + "integrity": "sha512-JPX0OiVCqs1BgXHi7wUpXjTlnv0wlOU2VN6BJFDgwbz/cBLDnxkBAZI4/iWXl+mzUY3CMSM9Prt1hfj+NYkhIA==" }, "@dcl/ecs-math": { "version": "2.0.2", @@ -33954,17 +33954,17 @@ "integrity": "sha512-Cg+MoIOn+BYmQV2q8zSFnNYY+GldlnUazwBnfgrq3i66ZxOaZ65h01btd8OUtSAlfWG4VTNIOHDjtKqmuwJNBg==" }, "@dcl/inspector": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/inspector/-/inspector-7.3.28.tgz", - "integrity": "sha512-avLzmc4Om1qLWR+hVNgefOmBDtjn8iJYLbYf4ZUWe6OToOc2eSP4UVF72KJRU/xx5O0tnP1KP/OISA10MYxaOA==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/inspector/-/inspector-7.3.29.tgz", + "integrity": "sha512-Qvs5OkgAOYB2y/VtCNsMnIanCuIoZRldi8h/gG6I52jhyxe7kUfWN4HaJUUwVhFTN8/hDrqxtPEMDeE2GOA2Sw==", "requires": { "@dcl/asset-packs": "^1.2.8" } }, "@dcl/js-runtime": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/js-runtime/-/js-runtime-7.3.28.tgz", - "integrity": "sha512-xkvPXkwctBiJS3ZwQh8KLk4QiAN03KJHiGTyc5pwPhM/Xlufq4h6kagjCDu6V6SLBoJ/cMetB53ukjQn46ctBA==" + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/js-runtime/-/js-runtime-7.3.29.tgz", + "integrity": "sha512-bb1RORbWNURnxphK4wpI3FkhPFb+w3ri9exp39w2H3mkjWfG2YXe0QuMu4oyHE0ERd7ZnFHfaRcjUGsws4hyjQ==" }, "@dcl/kernel": { "version": "1.0.0-2505075507.commit-6af9c3b", @@ -34066,11 +34066,11 @@ "integrity": "sha512-IPB043+NbQB3om2FlmQGmaRxTokHaSM9o3a7sEL0yJgBb60mukCpMdNXxzdIcemixfV3EhIJQ2G8HgK30XKTkA==" }, "@dcl/react-ecs": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/react-ecs/-/react-ecs-7.3.28.tgz", - "integrity": "sha512-e2OupSQxI0w19xJrrzLSHkgJ55HNC0dxRLSWI5nVTexVEyMAms8YqDO+LABNpbFpEKzPMoyFECni7Lo5yVLRgg==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/react-ecs/-/react-ecs-7.3.29.tgz", + "integrity": "sha512-LWTOxdi88IHnnI8FSjgEjxthMwRdWRV37fwoU8jWp7J/xbVkT2+/Hckrm7yd8Q/tHVmdSSiFcicuMiAA8LxYXQ==", "requires": { - "@dcl/ecs": "7.3.28", + "@dcl/ecs": "7.3.29", "react": "^18.2.0", "react-reconciler": "^0.29.0" }, @@ -34130,28 +34130,28 @@ } }, "@dcl/sdk": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/sdk/-/sdk-7.3.28.tgz", - "integrity": "sha512-ZcDV1ap7HvdaKoz3CuRk9WR+vFLGxx7lISZ2b2YyupQk7MJWAZuchImZrn66q6glChdq/H2ozZzsgwkesOjsdQ==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/sdk/-/sdk-7.3.29.tgz", + "integrity": "sha512-6nImr/r036ooT1JDvSvUUYL5K3BpOnkgNWkFE7nwnKKpqiHM9BBr499g9DqbuMEhmzMqQKmaesu8cruj2TYSiA==", "requires": { - "@dcl/ecs": "7.3.28", + "@dcl/ecs": "7.3.29", "@dcl/ecs-math": "2.0.2", "@dcl/explorer": "1.0.155192-20231106164658.commit-e3ed246", - "@dcl/js-runtime": "7.3.28", - "@dcl/react-ecs": "7.3.28", - "@dcl/sdk-commands": "7.3.28", + "@dcl/js-runtime": "7.3.29", + "@dcl/react-ecs": "7.3.29", + "@dcl/sdk-commands": "7.3.29", "text-encoding": "0.7.0" } }, "@dcl/sdk-commands": { - "version": "7.3.28", - "resolved": "https://registry.npmjs.org/@dcl/sdk-commands/-/sdk-commands-7.3.28.tgz", - "integrity": "sha512-m0eGMV1jbthogjyXC7CaZMgtAAuFvNGiXhHabC5re5La/EEzGhjAaT+NuDH9TADjPfQRYRtIq8IVT7dKTdsh9Q==", + "version": "7.3.29", + "resolved": "https://registry.npmjs.org/@dcl/sdk-commands/-/sdk-commands-7.3.29.tgz", + "integrity": "sha512-3XR/XCzHWcHpXX8vbWoC0iCwXUs4Rgh3YdGAwiTShZ8Fm4jTVy/pZVQVNW94ijN0s1XJ25ZJqJUMHoc0lqsM+Q==", "requires": { "@dcl/crypto": "^3.4.4", - "@dcl/ecs": "7.3.28", + "@dcl/ecs": "7.3.29", "@dcl/hashing": "1.1.3", - "@dcl/inspector": "7.3.28", + "@dcl/inspector": "7.3.29", "@dcl/linker-dapp": "^0.11.0", "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be", "@dcl/protocol": "1.0.0-6721819745.commit-dd7b9dc", @@ -34159,7 +34159,7 @@ "@dcl/quests-manager": "^0.1.4", "@dcl/rpc": "^1.1.1", "@dcl/schemas": "^8.2.3-20230718182824.commit-356025c", - "@segment/analytics-node": "^1.0.0-beta.22", + "@segment/analytics-node": "^1.1.3", "@well-known-components/env-config-provider": "^1.2.0", "@well-known-components/fetch-component": "^2.0.2", "@well-known-components/http-server": "^2.0.0-20230501134558.commit-be9a25d", @@ -34270,9 +34270,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==" + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==" }, "uuid": { "version": "9.0.1", @@ -35004,9 +35004,9 @@ } }, "@fastify/busboy": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", - "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz", + "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==" }, "@fluentui/react-component-event-listener": { "version": "0.63.1", @@ -49614,9 +49614,9 @@ }, "dependencies": { "lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==" + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.3.tgz", + "integrity": "sha512-B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg==" }, "minipass": { "version": "7.0.4", diff --git a/package.json b/package.json index 777b927c5..8147e4c58 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@dcl/hashing": "^3.0.4", "@dcl/mini-rpc": "^1.0.7", "@dcl/schemas": "^9.4.1", - "@dcl/sdk": "7.3.28", + "@dcl/sdk": "7.3.29", "@dcl/single-sign-on-client": "^0.1.0", "@dcl/ui-env": "^1.2.0", "@sentry/react": "^7.64.0", diff --git a/src/components/InspectorPage/InspectorPage.container.ts b/src/components/InspectorPage/InspectorPage.container.ts index ab3953be1..105b3a449 100644 --- a/src/components/InspectorPage/InspectorPage.container.ts +++ b/src/components/InspectorPage/InspectorPage.container.ts @@ -3,6 +3,7 @@ import { getAddress } from 'decentraland-dapps/dist/modules/wallet/selectors' import { RootState } from 'modules/common/types' import { isLoggedIn } from 'modules/identity/selectors' import { getCurrentScene } from 'modules/scene/selectors' +import { getCurrentProject } from 'modules/project/selectors' import { connectInspector, openInspector } from 'modules/inspector/actions' import { isReloading } from 'modules/inspector/selectors' import { getIsSmartItemsEnabled } from 'modules/features/selectors' @@ -14,6 +15,7 @@ const mapState = (state: RootState): MapStateProps => { address: getAddress(state), isLoggedIn: isLoggedIn(state), scene: getCurrentScene(state), + project: getCurrentProject(state), isReloading: isReloading(state), isSmartItemsEnabled: getIsSmartItemsEnabled(state) } diff --git a/src/components/InspectorPage/InspectorPage.tsx b/src/components/InspectorPage/InspectorPage.tsx index 0c04626d5..c79a309e2 100644 --- a/src/components/InspectorPage/InspectorPage.tsx +++ b/src/components/InspectorPage/InspectorPage.tsx @@ -30,7 +30,7 @@ export default class InspectorPage extends React.PureComponent { } render() { - const { scene, isLoggedIn, isReloading, isSmartItemsEnabled, address = '' } = this.props + const { scene, project, isLoggedIn, isReloading, isSmartItemsEnabled, address = '' } = this.props if (!isLoggedIn) { return @@ -63,6 +63,10 @@ export default class InspectorPage extends React.PureComponent { queryParams = queryParams.concat(`&segmentUserId=${address}`) + if (project?.id) { + queryParams = queryParams.concat(`&projectId=${project.id}`) + } + if (!isSmartItemsEnabled) { queryParams = queryParams.concat('&disableSmartItems') } diff --git a/src/components/InspectorPage/InspectorPage.types.ts b/src/components/InspectorPage/InspectorPage.types.ts index 32258c706..b98cf4e74 100644 --- a/src/components/InspectorPage/InspectorPage.types.ts +++ b/src/components/InspectorPage/InspectorPage.types.ts @@ -1,10 +1,12 @@ import { Dispatch } from 'redux' import { Scene } from 'modules/scene/types' +import { Project } from 'modules/project/types' import { connectInspector, ConnectInspectorAction, openInspector, OpenInspectorAction } from 'modules/inspector/actions' export type Props = { scene: Scene | null address?: string + project?: Project | null isLoggedIn: boolean isReloading: boolean isSmartItemsEnabled: boolean @@ -16,6 +18,6 @@ export type State = { isLoaded: boolean } -export type MapStateProps = Pick +export type MapStateProps = Pick export type MapDispatchProps = Pick export type MapDispatch = Dispatch From c2b4f15fdd0f57f37036cc9de017ebabb26a7bb1 Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Wed, 22 Nov 2023 16:22:44 -0300 Subject: [PATCH 3/3] feat: add deployment by path (#2986) --- .../workflows/set-rollout-by-path-manual.yaml | 46 +++++++++++++++++ .github/workflows/set-rollout-by-path.yaml | 50 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 .github/workflows/set-rollout-by-path-manual.yaml create mode 100644 .github/workflows/set-rollout-by-path.yaml diff --git a/.github/workflows/set-rollout-by-path-manual.yaml b/.github/workflows/set-rollout-by-path-manual.yaml new file mode 100644 index 000000000..2372197b7 --- /dev/null +++ b/.github/workflows/set-rollout-by-path-manual.yaml @@ -0,0 +1,46 @@ +name: Set rollout by path - Manual + +on: + workflow_dispatch: + inputs: + packageVersion: + description: "NPM Version of the release (@dcl/builder-site)" + required: true + default: "" + deploymentEnvironment: + type: "choice" + description: "Deployment environment" + required: true + default: "zone" + options: + - zone + - today + - org + rolloutPercentage: + description: "The percentage for this rollout" + required: true + default: "100" + +jobs: + set-manual-by-path-rollout: + runs-on: ubuntu-latest + steps: + - uses: hmarr/debug-action@v2 + - name: Set Rollout + uses: decentraland/set-rollout-action@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + + # Repo deployment info + ref: ${{ github.event.ref }} + sha: ${{ github.sha }} + + # CDN information + packageName: "@dcl/builder-site" + packageVersion: ${{ github.event.inputs.packageVersion }} + + # Rollout information + deploymentPath: "builder" + deploymentEnvironment: ${{ github.event.inputs.deploymentEnvironment }} + deploymentName: "_site" + percentage: ${{ github.event.inputs.rolloutPercentage }} diff --git a/.github/workflows/set-rollout-by-path.yaml b/.github/workflows/set-rollout-by-path.yaml new file mode 100644 index 000000000..10f32f142 --- /dev/null +++ b/.github/workflows/set-rollout-by-path.yaml @@ -0,0 +1,50 @@ +name: Set rollout by path + +on: [deployment_status] + +jobs: + set-rollout: + if: ${{ github.event.deployment.task == 'upload-to-cdn' && github.event.deployment_status.state == 'success' }} + runs-on: ubuntu-latest + steps: + - uses: hmarr/debug-action@v2 + + # Dev + - name: Set Rollout - Development + uses: decentraland/set-rollout-action@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + + # Repo deployment info + ref: ${{ github.event.deployment.ref }} + sha: ${{ github.event.deployment.sha }} + + # CDN information + packageName: ${{ github.event.deployment.payload.packageName }} + packageVersion: ${{ github.event.deployment.payload.packageVersion }} + + # Rollout information + deploymentPath: 'builder' + deploymentEnvironment: 'zone' + deploymentName: '_site' + percentage: 100 + + # Stg + - name: Set Rollout - Staging + uses: decentraland/set-rollout-action@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + + # Repo deployment info + ref: ${{ github.event.deployment.ref }} + sha: ${{ github.event.deployment.sha }} + + # CDN information + packageName: ${{ github.event.deployment.payload.packageName }} + packageVersion: ${{ github.event.deployment.payload.packageVersion }} + + # Rollout information + deploymentPath: 'builder' + deploymentEnvironment: 'today' + deploymentName: '_site' + percentage: 100