Merge branch 'main' into patch-2

Author: VariableVic

.github/scripts/medusa-config.js

@@ -0,0 +1,117 @@
+const dotenv = require("dotenv");
+
+let ENV_FILE_NAME = "";
+switch (process.env.NODE_ENV) {
+  case "production":
+    ENV_FILE_NAME = ".env.production";
+    break;
+  case "staging":
+    ENV_FILE_NAME = ".env.staging";
+    break;
+  case "test":
+    ENV_FILE_NAME = ".env.test";
+    break;
+  case "development":
+  default:
+    ENV_FILE_NAME = ".env";
+    break;
+}
+
+try {
+  dotenv.config({ path: process.cwd() + "/" + ENV_FILE_NAME });
+} catch (e) {}
+
+// CORS when consuming Medusa from admin
+const ADMIN_CORS =
+  process.env.ADMIN_CORS || "http://localhost:7000,http://localhost:7001";
+
+// CORS to avoid issues when consuming Medusa from a client
+const STORE_CORS = process.env.STORE_CORS || "http://localhost:8000";
+
+const DATABASE_URL =
+  process.env.DATABASE_URL || "postgres://medusa:password@localhost/medusa";
+
+const REDIS_URL = process.env.REDIS_URL || "redis://localhost:6379";
+
+const plugins = [
+  `medusa-fulfillment-manual`,
+  `medusa-payment-manual`,
+  {
+    resolve: `@medusajs/file-local`,
+    options: {
+      upload_dir: "uploads",
+    },
+  },
+  {
+    resolve: "@medusajs/admin",
+    /** @type {import('@medusajs/admin').PluginOptions} */
+    options: {
+      autoRebuild: true,
+      develop: {
+        open: process.env.OPEN_BROWSER !== "false",
+      },
+    },
+  },
+  {
+    resolve: `medusa-plugin-meilisearch`,
+    options: {
+      config: {
+        host: process.env.MEILISEARCH_HOST,
+        apiKey: process.env.MEILISEARCH_API_KEY,
+      },
+      settings: {
+        products: {
+          indexSettings: {
+            searchableAttributes: [
+              "title", 
+              "description",
+              "variant_sku",
+            ],
+            displayedAttributes: [
+              "id", 
+              "title", 
+              "description", 
+              "variant_sku", 
+              "thumbnail", 
+              "handle",
+            ],
+          },
+          primaryKey: "id",
+        },
+      },
+    },
+  },
+];
+
+const modules = {
+  /*eventBus: {
+    resolve: "@medusajs/event-bus-redis",
+    options: {
+      redisUrl: REDIS_URL
+    }
+  },
+  cacheService: {
+    resolve: "@medusajs/cache-redis",
+    options: {
+      redisUrl: REDIS_URL
+    }
+  },*/
+};
+
+/** @type {import('@medusajs/medusa').ConfigModule["projectConfig"]} */
+const projectConfig = {
+  jwtSecret: process.env.JWT_SECRET,
+  cookieSecret: process.env.COOKIE_SECRET,
+  store_cors: STORE_CORS,
+  database_url: DATABASE_URL,
+  admin_cors: ADMIN_CORS,
+  // Uncomment the following lines to enable REDIS
+  redis_url: REDIS_URL
+};
+
+/** @type {import('@medusajs/medusa').ConfigModule} */
+module.exports = {
+  projectConfig,
+  plugins,
+  modules,
+};

.github/workflows/test-e2e.yaml

@@ -29,7 +29,16 @@ env:
   DATABASE_TYPE: "postgres"
   REDIS_URL: redis://localhost:6379
   DATABASE_URL: postgres://test_medusa_user:password@localhost/test_medusa_db
+  MEILISEARCH_HOST: http://localhost:7700
+  MEILISEARCH_API_KEY: meili_api_key
+
   NEXT_PUBLIC_BASE_URL: http://localhost:8000
+  NEXT_PUBLIC_DEFAULT_REGION: us
+  NEXT_PUBLIC_MEDUSA_BACKEND_URL: http://localhost:9000
+  NEXT_PUBLIC_INDEX_NAME: products
+  NEXT_PUBLIC_SEARCH_ENDPOINT: http://127.0.0.1:7700
+  NEXT_PUBLIC_SEARCH_API_KEY: meili_api_key
+  REVALIDATE_SECRET: supersecret
 
 jobs:
   e2e-test-runner:
@@ -53,6 +62,9 @@ jobs:
 
       meilisearch:
         image: getmeili/meilisearch:v1.7
+        env:
+          MEILI_MASTER_KEY: meili_api_key
+          MEILI_ENV: development
         ports:
           - 7700:7700
         options: >-
@@ -100,11 +112,18 @@ jobs:
           --db-database ${{ env.TEST_POSTGRES_DATABASE }} \
           --db-host ${{ env.TEST_POSTGRES_HOST }} \
           --db-port ${{ env.TEST_POSTGREST_PORT }}
-        
+
       - name: Build the backend
         working-directory: ../backend
         run: yarn build:admin
 
+      - name: Setup search in the backend
+        working-directory: ../backend
+        run: yarn add medusa-plugin-meilisearch
+
+      - name: Move custom medusa config to the backend
+        run: cp .github/scripts/medusa-config.js ../backend/medusa-config.js
+
       - name: Seed data from default seed file
         working-directory: ../backend
         run: medusa seed --seed-file=data/seed.json
@@ -119,9 +138,6 @@ jobs:
       - name: Install playwright
         run: yarn playwright install --with-deps
 
-      - name: Copy environment
-        run: cp .env.template .env
-
       - name: Setup frontend
         run: yarn build
 

e2e/fixtures/account/order-page.ts

@@ -26,7 +26,7 @@ export class OrderPage extends AccountPage {
 
   constructor(page: Page) {
     super(page)
-    this.container = page.getByTestId("order-complete-container")
+    this.container = page.getByTestId("order-details-container")
     this.backToOverviewButton = page.getByTestId("back-to-overview-button")
     this.orderEmail = this.container.getByTestId("order-email")
     this.orderDate = this.container.getByTestId("order-date")
@@ -63,17 +63,16 @@ export class OrderPage extends AccountPage {
   async getProduct(title: string, variant: string) {
     const productRow = this.productRow
       .filter({
-        has: this.productTitle.filter({ hasText: title }),
+        hasText: title,
       })
       .filter({
-        has: this.productVariant.filter({ hasText: variant }),
+        hasText: `Variant: ${variant}`,
       })
     return {
       productRow,
-      title: productRow.getByTestId("product-title"),
+      name: productRow.getByTestId("product-name"),
       variant: productRow.getByTestId("product-variant"),
-      deleteButton: productRow.getByTestId("delete-button"),
-      quantitySelect: productRow.getByTestId("quantity-select"),
+      quantity: productRow.getByTestId("product-quantity"),
       price: productRow.getByTestId("product-unit-price"),
       total: productRow.getByTestId("product-price"),
     }

e2e/fixtures/account/orders-page.ts

@@ -20,8 +20,14 @@ export class OrdersPage extends AccountPage {
     this.orderDisplayId = page.getByTestId("order-display-id")
   }
 
-  async getOrder(text: string) {
-    const card = this.orderCard.filter({ hasText: "text" }).first()
+  async getOrderById(orderId: string) {
+    const orderIdLocator = this.page
+      .getByTestId("order-display-id")
+      .filter({
+        hasText: orderId,
+      })
+      .first()
+    const card = this.orderCard.filter({ has: orderIdLocator }).first()
     const items = (await card.getByTestId("order-item").all()).map(
       (orderItem) => {
         return {
@@ -35,8 +41,10 @@ export class OrdersPage extends AccountPage {
       card,
       displayId: card.getByTestId("order-display-id"),
       createdAt: card.getByTestId("order-created-at"),
+      orderId: card.getByTestId("order-display-id"),
       amount: card.getByTestId("order-amount"),
       detailsLink: card.getByTestId("order-details-link"),
+      itemsLocator: card.getByTestId("order-item"),
       items,
     }
   }

e2e/fixtures/base/base-page.ts

@@ -1,11 +1,13 @@
 import { CartDropdown } from "./cart-dropdown"
 import { NavMenu } from "./nav-menu"
 import { Page, Locator } from "@playwright/test"
+import { SearchModal } from "./search-modal"
 
 export class BasePage {
   page: Page
   navMenu: NavMenu
   cartDropdown: CartDropdown
+  searchModal: SearchModal
   accountLink: Locator
   searchLink: Locator
   storeLink: Locator
@@ -15,6 +17,7 @@ export class BasePage {
     this.page = page
     this.navMenu = new NavMenu(page)
     this.cartDropdown = new CartDropdown(page)
+    this.searchModal = new SearchModal(page)
     this.accountLink = page.getByTestId("nav-account-link")
     this.storeLink = page.getByTestId("nav-store-link")
     this.searchLink = page.getByTestId("nav-search-link")

e2e/fixtures/base/search-modal.ts

@@ -0,0 +1,36 @@
+import { Page, Locator } from "@playwright/test"
+import { BaseModal } from "./base-modal"
+import { NavMenu } from "./nav-menu"
+
+export class SearchModal extends BaseModal {
+  searchInput: Locator
+  searchResults: Locator
+  noSearchResultsContainer: Locator
+  searchResult: Locator
+  searchResultTitle: Locator
+
+  constructor(page: Page) {
+    super(page, page.getByTestId("search-modal-container"))
+    this.searchInput = this.container.getByTestId("search-input")
+    this.searchResults = this.container.getByTestId("search-results")
+    this.noSearchResultsContainer = this.container.getByTestId(
+      "no-search-results-container"
+    )
+    this.searchResult = this.container.getByTestId("search-result")
+    this.searchResultTitle = this.container.getByTestId("search-result-title")
+  }
+
+  async open() {
+    const menu = new NavMenu(this.page)
+    await menu.open()
+    await menu.searchLink.click()
+    await this.container.waitFor({ state: "visible" })
+  }
+
+  async close() {
+    const viewport = this.page.viewportSize()
+    const y = viewport ? viewport.height / 2 : 100
+    await this.page.mouse.click(1, y, { clickCount: 2, delay: 100 })
+    await this.container.waitFor({ state: "hidden" })
+  }
+}

e2e/fixtures/checkout-page.ts

@@ -42,6 +42,7 @@ export class CheckoutPage extends BasePage {
   submitAddressButton: Locator
   addressErrorMessage: Locator
 
+  deliveryOptionsContainer: Locator
   deliveryOptionRadio: Locator
   deliveryOptionErrorMessage: Locator
   submitDeliveryOptionButton: Locator
@@ -166,6 +167,9 @@ export class CheckoutPage extends BasePage {
       "address-error-message"
     )
 
+    this.deliveryOptionsContainer = this.container.getByTestId(
+      "delivery-options-container"
+    )
     this.deliveryOptionRadio = this.container.getByTestId(
       "delivery-option-radio"
     )