Merge branch 'develop' into fix/include-region-in-shipping-option-ret…

…rieval

.changeset/cool-buckets-remember.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/js-sdk": patch
+---
+
+fix: Add support for relative base URL to js-sdk

.changeset/early-queens-prove.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/types": patch
+---
+
+fix(types): Prev limit wrong values

.changeset/eleven-students-cover.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/telemetry": patch
+"@medusajs/medusa": patch
+---
+
+fix(telemetry): Pointing and resolving packages wrongly

.changeset/shiny-spiders-raise.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/utils": patch
+---
+
+fix(utils): Mikro orm repository update many to many should detach all items by default

.changeset/tall-starfishes-travel.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/workflows-sdk": patch
+---
+
+fix(workflows-sdk): Paralellize steps rollback issue with config

.changeset/tame-sloths-pump.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/utils": patch
+---
+
+fix(utils/dml): set-relationship graphql generator from DML wrong managed belongsTo

.changeset/tough-spiders-admire.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/dashboard": patch
+"@medusajs/framework": patch
+"@medusajs/types": patch
+"@medusajs/utils": patch
+---
+
+fix: Default to a relative path for backend URL in admin

.github/ISSUE_TEMPLATE/bug_report_v2.yml

@@ -0,0 +1,77 @@
+name: Bug report for v2.0
+description: File a bug report.
+title: "[Bug]: "
+labels: ["status: needs triaging", "version: 2.0"]
+body:
+  - type: markdown
+    attributes:
+      value: "## System information"
+  - type: markdown
+    attributes:
+      value: |
+        The system information will help us reproduce the issue in the same environment
+  - type: textarea
+    attributes:
+      label: Package.json file
+      description: Copy/paste the contents of the `package.json` file. No need to use backticks
+      placeholder: No need to use markdown backticks. Just copy/paste the contents of the file
+      render: JSON
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Node.js version
+      description: Copy/paste the output of `node -v` command.
+      placeholder: v21.0.0
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Database and its version
+      placeholder: PostgreSQL 16.2
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system name and version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Browser name
+  - type: markdown
+    attributes:
+      value: "## Describe the issue"
+  - type: markdown
+    attributes:
+      value: |
+        Please explain your issue in-depth along with the relevant screenshots and code snippets
+  - type: textarea
+    attributes:
+      label: What happended?
+      placeholder: A clear and concise description of what the bug is
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual behavior
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: "## Reproduction"
+  - type: markdown
+    attributes:
+      value: |
+        Providing a reproduction repo allows us to quickly validate the issue and get back to you.
+  - type: input
+    attributes:
+      label: Link to reproduction repo
+      description: Please reproduce the issue in isolation and share it as a Github repo with us
+    validations:
+      required: true

.github/workflows/create-linear-issue-on-discussion.yml

@@ -0,0 +1,20 @@
+name: Create Linear Issue on Discussions
+
+on:
+  discussion:
+    types: [created]
+
+jobs:
+  create-linear-issue-on-discussion:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create the Linear Issue
+        id: createIssue
+        uses: ctriolo/action-create-linear-issue@v0.5
+        with:
+          linear-api-key: ${{secrets.LINEAR_API_KEY}}
+          linear-team-key: "TRI"
+          linear-issue-title: ${{github.event.discussion.title}}
+          linear-issue-description: ${{github.event.discussion.body}}
+          linear-attachment-url: ${{github.event.discussion.html_url}}
+          linear-attachment-title: ${{github.event.discussion.title}}

.github/workflows/create-linear-issue-on-pr.yml

@@ -0,0 +1,36 @@
+name: Create Linear Issue on Pull Request
+
+on:
+  pull_request:
+    branches:
+      - develop
+    types: [opened]
+
+jobs:
+  create-linear-issue-on-pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if PR Author is in Team
+        id: check_author
+        env:
+          GITHUB_TOKEN: ${{ secrets.READ_ORG_PAT }}
+        run: |
+          response=$(curl -s -o /dev/null -w "%{http_code}" \
+            -H "Authorization: Bearer $GITHUB_TOKEN" \
+            https://api.github.com/orgs/medusajs/teams/engineering/memberships/${{ github.event.pull_request.user.login }})
+          if [[ "$response" -eq 200 ]]; then
+            echo "author_is_team_member=true\n" >> $GITHUB_OUTPUT
+          else
+            echo "author_is_team_member=false\n" >> $GITHUB_OUTPUT
+          fi
+      - name: Create the Linear Issue
+        if: ${{ steps.check_author.outputs.author_is_team_member == 'false' }}
+        id: create_issue
+        uses: ctriolo/action-create-linear-issue@v0.5
+        with:
+          linear-api-key: ${{secrets.LINEAR_API_KEY}}
+          linear-team-key: "SUP"
+          linear-issue-title: ${{github.event.pull_request.title}}
+          linear-issue-description: ${{github.event.pull_request.body}}
+          linear-attachment-url: ${{github.event.pull_request.html_url}}
+          linear-attachment-title: ${{github.event.pull_request.title}}

packages/admin/dashboard/src/components/utilities/keybound-form/keybound-form.tsx

@@ -14,6 +14,13 @@ export const KeyboundForm = React.forwardRef<
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLFormElement>) => {
     if (event.key === "Enter") {
+      if (
+        event.target instanceof HTMLTextAreaElement &&
+        !(event.metaKey || event.ctrlKey)
+      ) {
+        return
+      }
+
       event.preventDefault()
 
       if (event.metaKey || event.ctrlKey) {

packages/admin/dashboard/src/i18n/translations/$schema.json

@@ -1555,6 +1555,26 @@
           ],
           "additionalProperties": false
         },
+        "edit": {
+          "type": "object",
+          "properties": {
+            "header": {
+              "type": "string"
+            },
+            "description": {
+              "type": "string"
+            },
+            "successToast": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "header",
+            "description",
+            "successToast"
+          ],
+          "additionalProperties": false
+        },
         "create": {
           "type": "object",
           "properties": {
@@ -1894,9 +1914,6 @@
         "attributes": {
           "type": "string"
         },
-        "editProduct": {
-          "type": "string"
-        },
         "editAttributes": {
           "type": "string"
         },
@@ -2667,13 +2684,13 @@
       "required": [
         "domain",
         "list",
+        "edit",
         "create",
         "export",
         "import",
         "deleteWarning",
         "variants",
         "attributes",
-        "editProduct",
         "editAttributes",
         "editOptions",
         "editPrices",

packages/admin/dashboard/src/i18n/translations/en.json

@@ -380,6 +380,11 @@
     "list": {
       "noRecordsMessage": "Create your first product to start selling."
     },
+    "edit": {
+      "header": "Edit Product",
+      "description": "Edit the product details.",
+      "successToast": "Product {{title}} was successfully updated."
+    },
     "create": {
       "header": "General",
       "tabs": {
@@ -462,7 +467,6 @@
     "deleteWarning": "You are about to delete the product {{title}}. This action cannot be undone.",
     "variants": "Variants",
     "attributes": "Attributes",
-    "editProduct": "Edit Product",
     "editAttributes": "Edit Attributes",
     "editOptions": "Edit Options",
     "editPrices": "Edit prices",

packages/admin/dashboard/src/lib/client/client.ts

@@ -1,6 +1,6 @@
 import Medusa from "@medusajs/js-sdk"
 
-export const backendUrl = __BACKEND_URL__ ?? "http://localhost:9000"
+export const backendUrl = __BACKEND_URL__ ?? "/"
 
 export const sdk = new Medusa({
   baseUrl: backendUrl,

packages/admin/dashboard/src/lib/query-client.ts

@@ -1,6 +1,6 @@
 import { QueryClient } from "@tanstack/react-query"
 
-export const MEDUSA_BACKEND_URL = __BACKEND_URL__ ?? "http://localhost:9000"
+export const MEDUSA_BACKEND_URL = __BACKEND_URL__ ?? "/"
 
 export const queryClient = new QueryClient({
   defaultOptions: {

packages/admin/dashboard/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx

@@ -1,4 +1,4 @@
-import { Button, Input, Select, Text, Textarea } from "@medusajs/ui"
+import { Button, Input, Select, Text, Textarea, toast } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import * as zod from "zod"
 
@@ -69,9 +69,15 @@ export const EditProductForm = ({ product }: EditProductFormProps) => {
         ...nullableData,
       },
       {
-        onSuccess: () => {
+        onSuccess: ({ product }) => {
+          toast.success(
+            t("products.edit.successToast", { title: product.title })
+          )
           handleSuccess()
         },
+        onError: (e) => {
+          toast.error(e.message)
+        },
       }
     )
   })

packages/admin/dashboard/src/routes/products/product-edit/product-edit.tsx

@@ -23,8 +23,11 @@ export const ProductEdit = () => {
     <RouteDrawer>
       <RouteDrawer.Header>
         <RouteDrawer.Title asChild>
-          <Heading>{t("products.editProduct")}</Heading>
+          <Heading>{t("products.edit.header")}</Heading>
         </RouteDrawer.Title>
+        <RouteDrawer.Description className="sr-only">
+          {t("products.edit.description")}
+        </RouteDrawer.Description>
       </RouteDrawer.Header>
       {!isLoading && product && <EditProductForm product={product} />}
     </RouteDrawer>

packages/core/framework/src/config/types.ts

@@ -72,7 +72,7 @@ export type AdminOptions = {
    */
   outDir?: string
   /**
-   * The URL of your Medusa application. This is useful to set when you deploy the Medusa application.
+   * The URL of your Medusa application. Defaults to the browser origin. This is useful to set when running the admin on a separate domain.
    *
    * @example
    * ```ts title="medusa-config.ts"