Show Explore Extensions for self-hosted with static JSON fallback; remove legacy APPS_MARKETPLACE_API_URL

.changeset/fiery-pigs-kiss.md

@@ -0,0 +1,6 @@
+---
+"saleor-dashboard": patch
+---
+
+When App Store is not configured (env variable not set), Dashboard will not longer crash. Instead it will load
+local catalog of apps and plugins to render them as a fallback

.devcontainer/dashboard.env

@@ -8,9 +8,6 @@ API_URL=http://localhost:8000/graphql/
 APP_MOUNT_URI=/dashboard/
 STATIC_URL=/dashboard/
 
-# Marketplace API URL to get Saleor app listings, used to retrieve information about
-# apps from the Saleor App Marketplace.
-APPS_MARKETPLACE_API_URL=https://apps.saleor.io/api/v2/saleor-apps
 EXTENSIONS_API_URL=https://apps.saleor.io/api/v1/extensions
 
 # Language for the Dashboard (ISO 639-1 format, e.g., `EN` for English,

.env.template

@@ -1,7 +1,7 @@
 API_URL=http://localhost:8000/graphql/
 APP_MOUNT_URI=/
-APPS_MARKETPLACE_API_URL=https://apps.saleor.io/api/v2/saleor-apps
-EXTENSIONS_API_URL=https://apps.saleor.io/api/v1/extensions
+# Provides source for App Store / explore feature. Only for Saleor Cloud
+# EXTENSIONS_API_URL=https://apps.saleor.io/api/v1/extensions
 LOCALE_CODE="EN"
 
 # Multi-schema support (optional)

.github/actions/run-pw-tests/action.yml

@@ -108,9 +108,6 @@ runs:
     - name: Run tests
       shell: bash
       env:
-        ## backward compatibility for older versions
-        API_URI: ${{ inputs.API_URL }}
-
         API_URL: ${{ inputs.API_URL }}
         BASE_URL: ${{ inputs.BASE_URL }}
         E2E_USER_NAME: ${{ inputs.E2E_USER_NAME }}

.github/workflows/deploy-cloud.yaml

@@ -33,11 +33,6 @@ jobs:
     outputs:
       ENVIRONMENT: ${{ env.ENVIRONMENT }}
     env:
-      ## backward compatibility for older versions
-      APPS_MARKETPLACE_API_URI: "https://apps.saleor.io/api/v2/saleor-apps"
-      ## backward compatibility for older versions
-      API_URI: /graphql/
-
       API_URL: /graphql/
       APP_MOUNT_URI: /dashboard/
       STATIC_URL: /dashboard/static/
@@ -48,7 +43,6 @@ jobs:
       REGION: ${{ github.event.client_payload.region }}
       SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      APPS_MARKETPLACE_API_URL: "https://apps.saleor.io/api/v2/saleor-apps"
       EXTENSIONS_API_URL: "https://apps.saleor.io/api/v1/extensions"
       IS_CLOUD_INSTANCE: true
       POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }}

.github/workflows/deploy-dev.yaml

@@ -15,11 +15,6 @@ jobs:
       id-token: write # needed by aws-actions/configure-aws-credentials
       contents: read
     env:
-      ## backward compatibility for older versions
-      APPS_MARKETPLACE_API_URI: "https://apps.staging.saleor.io/api/v2/saleor-apps"
-      ## backward compatibility for older versions
-      API_URI: /graphql/
-
       API_URL: /graphql/
       APP_MOUNT_URI: /dashboard/
       STATIC_URL: /dashboard/static/
@@ -28,7 +23,6 @@ jobs:
       SENTRY_URL_PREFIX: "~/dashboard/static"
       SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      APPS_MARKETPLACE_API_URL: "https://apps.staging.saleor.io/api/v2/saleor-apps"
       EXTENSIONS_API_URL: "https://apps.staging.saleor.io/api/v1/extensions"
       ENABLED_SERVICE_NAME_HEADER: true
       ONBOARDING_USER_JOINED_DATE_THRESHOLD: ${{ vars.DEV_ONBOARDING_USER_JOINED_DATE_THRESHOLD }}

.github/workflows/deploy-master-staging.yaml

@@ -14,11 +14,6 @@ jobs:
     outputs:
       CUSTOM_VERSION: ${{ env.CUSTOM_VERSION }}
     env:
-      ## backward compatibility for older versions
-      API_URI: /graphql/
-      ## backward compatibility for older versions
-      APPS_MARKETPLACE_API_URI: "https://apps.staging.saleor.io/api/v2/saleor-apps"
-
       API_URL: /graphql/
       APP_MOUNT_URI: /dashboard/
       STATIC_URL: /dashboard/static/
@@ -27,7 +22,6 @@ jobs:
       SENTRY_URL_PREFIX: "~/dashboard/static"
       SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      APPS_MARKETPLACE_API_URL: "https://apps.staging.saleor.io/api/v2/saleor-apps"
       EXTENSIONS_API_URL: "https://apps.staging.saleor.io/api/v1/extensions"
       IS_CLOUD_INSTANCE: true
       ENABLED_SERVICE_NAME_HEADER: true

.github/workflows/deploy-staging-and-prepare-release.yaml

@@ -65,11 +65,6 @@ jobs:
       CUSTOM_VERSION: ${{ env.CUSTOM_VERSION || env.VERSION }}
       ENVIRONMENT: ${{ env.ENVIRONMENT }}
     env:
-      ## backward compatibility for older versions
-      APPS_MARKETPLACE_API_URI: "https://apps.staging.saleor.io/api/v2/saleor-apps"
-      ## backward compatibility for older versions
-      API_URI: /graphql/
-
       API_URL: /graphql/
       APP_MOUNT_URI: /dashboard/
       STATIC_URL: /dashboard/static/
@@ -78,7 +73,6 @@ jobs:
       SENTRY_URL_PREFIX: "~/dashboard/static"
       SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      APPS_MARKETPLACE_API_URL: "https://apps.staging.saleor.io/api/v2/saleor-apps"
       EXTENSIONS_API_URL: "https://apps.staging.saleor.io/api/v1/extensions"
       VERSION: ${{ github.event.inputs.git_ref || github.ref_name }}
       IS_CLOUD_INSTANCE: true

.github/workflows/pr-automation.yml

@@ -120,13 +120,7 @@ jobs:
       - name: Build dashboard
         id: build-dashboard
         env:
-          ## backward compatibility for older versions
-          API_URI: ${{ needs.initialize-cloud.outputs.API_URL }}
-          ## backward compatibility for older versions
-          APPS_MARKETPLACE_API_URI: "https://apps.staging.saleor.io/api/v2/saleor-apps"
-
           API_URL: ${{ needs.initialize-cloud.outputs.API_URL }}
-          APPS_MARKETPLACE_API_URL: "https://apps.staging.saleor.io/api/v2/saleor-apps"
           EXTENSIONS_API_URL: "https://apps.staging.saleor.io/api/v1/extensions"
           APP_MOUNT_URI: /
           STATIC_URL: /

.storybook/preview-head.html

@@ -3,9 +3,7 @@
     API_URL: "/graphql/",
     APP_MOUNT_URI: "/",
     STATIC_URL: "/",
-    APPS_MARKETPLACE_API_URL: "https://marketplace.saleor.io",
     EXTENSIONS_API_URL: "https://extensions.saleor.io",
-    APPS_TUNNEL_URL_KEYWORDS: "",
     IS_CLOUD_INSTANCE: "false",
     LOCALE_CODE: "",
   };

Dockerfile

@@ -22,18 +22,14 @@ COPY src/ src/
 
 ARG API_URL
 ARG APP_MOUNT_URI
-ARG APPS_MARKETPLACE_API_URL
 ARG EXTENSIONS_API_URL
-ARG APPS_TUNNEL_URL_KEYWORDS
 ARG STATIC_URL
 ARG SKIP_SOURCEMAPS
 ARG LOCALE_CODE
 
 ENV API_URL="${API_URL:-http://localhost:8000/graphql/}"
 ENV APP_MOUNT_URI="${APP_MOUNT_URI:-/dashboard/}"
-ENV APPS_MARKETPLACE_API_URL="${APPS_MARKETPLACE_API_URL:-https://apps.saleor.io/api/v2/saleor-apps}"
-ENV EXTENSIONS_API_URL="${EXTENSIONS_API_URL:-https://apps.saleor.io/api/v1/extensions}"
-ENV APPS_TUNNEL_URL_KEYWORDS="${APPS_TUNNEL_URL_KEYWORDS}"
+ENV EXTENSIONS_API_URL="${EXTENSIONS_API_URL}"
 ENV STATIC_URL="${STATIC_URL:-/dashboard/}"
 ENV SKIP_SOURCEMAPS="${SKIP_SOURCEMAPS:-true}"
 ENV LOCALE_CODE="${LOCALE_CODE:-EN}"

docs/configuration.md

@@ -18,11 +18,7 @@ Create or edit `.env` file in a root directory or set environment variables with
 - `STATIC_URL` - URL where the static files are located.
   E.g., if you use an S3 bucket, you should set it to the bucket's URL. By default, Saleor assumes you serve static files from the root of your site at "http://localhost:9000/".
 
-- `APPS_MARKETPLACE_API_URL` - URI of Marketplace API to fetch list of Apps in JSON.
-
-- `EXTENSIONS_API_URL` - URI of Marketplace API to fetch list of Extensions in JSON.
-
-- `APPS_TUNNEL_URL_KEYWORDS` - Custom apps tunnel URL keywords.
+- `EXTENSIONS_API_URL` - Optional URI of the Saleor Marketplace API used to fetch the list of extensions in JSON. Saleor Cloud projects have this preconfigured; self-hosted deployments can omit it and the Dashboard will fall back to a bundled `extensions.json` dataset and show a self-hosted banner in the Explore view.
 
 ## Fetching schema
 

docs/docker.md

@@ -26,9 +26,7 @@ The replacement is not limited to `API_URL` only. You can also replace other env
 docker exec -it \
   -e "API_URL=NEW_API_URL" \
   -e "APP_MOUNT_URI=NEW_APP_MOUNT_URI" \
-  -e "APPS_MARKETPLACE_API_URL=NEW_APPS_MARKETPLACE_API_URL" \
   -e "EXTENSIONS_API_URL=NEW_EXTENSIONS_API_URL" \
-  -e "APPS_TUNNEL_URL_KEYWORDS=NEW_APPS_TUNNEL_URL_KEYWORDS" \
   -e "IS_CLOUD_INSTANCE=NEW_IS_CLOUD_INSTANCE" \
   -e "LOCALE_CODE=NEW_LOCALE_CODE" \
   saleor-dashboard /docker-entrypoint.d/50-replace-env-vars.sh
@@ -40,9 +38,7 @@ Of course you can also provide all the environment variables at the `docker run`
 docker run --publish 8080:80 \
   -e "API_URL=NEW_API_URL" \
   -e "APP_MOUNT_URI=NEW_APP_MOUNT_URI" \
-  -e "APPS_MARKETPLACE_API_URL=NEW_APPS_MARKETPLACE_API_URL" \
   -e "EXTENSIONS_API_URL=NEW_EXTENSIONS_API_URL" \
-  -e "APPS_TUNNEL_URL_KEYWORDS=NEW_APPS_TUNNEL_URL_KEYWORDS" \
   -e "IS_CLOUD_INSTANCE=NEW_IS_CLOUD_INSTANCE" \
   -e "LOCALE_CODE=NEW_LOCALE_CODE" \
   saleor-dashboard

locale/defaultMessages.json

@@ -1408,6 +1408,9 @@
     "context": "tax strategy combobox hint",
     "string": "Select the method of tax calculation"
   },
+  "6IteaF": {
+    "string": "Apps are available for Saleor Cloud users. Most of them are available for self-hosting."
+  },
   "6J1m2c": {
     "string": "Create a Model"
   },
@@ -7784,9 +7787,6 @@
   "gVqSnA": {
     "string": "Assign and save"
   },
-  "gZ1qnD": {
-    "string": "No extensions API URL provided"
-  },
   "gaOXvo": {
     "context": "notification, form submitted",
     "string": "Refund grant for order #{orderNumber} was updated"

nginx/replace-env-vars.sh

@@ -13,7 +13,7 @@ replace_env_var() {
   var_value=$(eval echo \$"$var_name")
   if [ -n "$var_value" ]; then
     echo "Setting $var_name to: $var_value"
-    sed -i "s#$var_name: \".*\"#$var_name: \"$var_value\"#" "$INDEX_BUNDLE_PATH"
+    sed -i "s#\([[:space:]]*\)$var_name:[[:space:]]*\"[^\"]*\"#\1$var_name: \"$var_value\"#" "$INDEX_BUNDLE_PATH"
   else
     echo "No $var_name provided, using defaults."
   fi
@@ -22,9 +22,7 @@ replace_env_var() {
 # Replace each environment variable
 replace_env_var "API_URL"
 replace_env_var "APP_MOUNT_URI"
-replace_env_var "APPS_MARKETPLACE_API_URL"
 replace_env_var "EXTENSIONS_API_URL"
-replace_env_var "APPS_TUNNEL_URL_KEYWORDS"
 replace_env_var "IS_CLOUD_INSTANCE"
 replace_env_var "LOCALE_CODE"
 

src/components/NavigatorSearch/useActionTriggers.tsx

@@ -600,7 +600,7 @@ const allActions: TriggerDescriptor[] = [
   {
     section: allMessages.extensionsSection,
     name: allMessages.gotoExploreExtensions,
-    Component: ({ onClick }) => (
+    Component: ({ onClick }: { onClick?: React.MouseEventHandler<HTMLAnchorElement> }) => (
       <Box onClick={onClick}>
         <ActionLinkItem href={ExtensionsUrls.resolveExploreExtensionsUrl()}>
           <FormattedMessage {...allMessages.gotoExploreExtensions} />

src/components/Sidebar/menu/hooks/useMenuStructure.tsx

@@ -92,7 +92,7 @@ export function useMenuStructure() {
         id: "explore-extensions",
         url: ExtensionsPaths.exploreExtensions,
         permissions: [],
-        type: "item",
+        type: "item" as const,
       },
     ],
   });

src/config.ts

@@ -32,15 +32,6 @@ export const getAbsoluteApiUrl = () => new URL(getApiUrl(), window.location.orig
 export const SW_INTERVAL = parseInt(process.env.SW_INTERVAL ?? "300", 10);
 export const IS_CLOUD_INSTANCE = window.__SALEOR_CONFIG__.IS_CLOUD_INSTANCE === "true";
 
-export const getAppsConfig = () => ({
-  marketplaceApiUri: window.__SALEOR_CONFIG__.APPS_MARKETPLACE_API_URL,
-  tunnelUrlKeywords: window.__SALEOR_CONFIG__.APPS_TUNNEL_URL_KEYWORDS?.split(";") || [
-    ".ngrok.io",
-    ".saleor.live",
-    ".trycloudflare.com",
-  ],
-});
-
 export const getExtensionsConfig = () => ({
   extensionsApiUri: window.__SALEOR_CONFIG__.EXTENSIONS_API_URL,
 });