Merge branch 'main' of https://github.com/o2sdev/openselfservice into feature/adding-checkboxes-in-lists

lukasz-hycom · lukasz-hycom · commit ba1814553cbf · 2025-12-08T19:01:32.000+01:00
diff --git a/.changeset/yummy-cups-chew.md b/.changeset/yummy-cups-chew.md
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -14,7 +14,7 @@
         "generate:component": "turbo gen web-component"
     },
     "dependencies": {
-        "@contentful/live-preview": "^4.7.0",
+        "@contentful/live-preview": "^4.8.2",
         "@o2s/blocks.article": "*",
         "@o2s/blocks.article-list": "*",
         "@o2s/blocks.article-search": "*",
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/blocks/bento-grid/package.json b/packages/blocks/bento-grid/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/blocks/cta-section/package.json b/packages/blocks/cta-section/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/blocks/document-list/package.json b/packages/blocks/document-list/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/blocks/feature-section-grid/package.json b/packages/blocks/feature-section-grid/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/blocks/feature-section/package.json b/packages/blocks/feature-section/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/blocks/hero-section/package.json b/packages/blocks/hero-section/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/blocks/media-section/package.json b/packages/blocks/media-section/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/blocks/order-list/CHANGELOG.md b/packages/blocks/order-list/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @o2s/blocks.order-list
 
+## 1.3.1
+
+### Patch Changes
+
+- abd3b41: added missing `getRowKey` mapper
+- Updated dependencies [abd3b41]
+- Updated dependencies [be6f80b]
+- Updated dependencies [f999bb1]
+  - @o2s/ui@1.7.1
+
 ## 1.3.0
 
 ### Minor Changes
diff --git a/packages/blocks/order-list/package.json b/packages/blocks/order-list/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@o2s/blocks.order-list",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "private": false,
     "license": "MIT",
     "description": "A block displaying a list of orders.",
diff --git a/packages/blocks/orders-summary/CHANGELOG.md b/packages/blocks/orders-summary/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @o2s/blocks.orders-summary
 
+## 1.2.1
+
+### Patch Changes
+
+- 0775ad9: aligned inner tiles to have equal heights
+- Updated dependencies [abd3b41]
+- Updated dependencies [be6f80b]
+- Updated dependencies [f999bb1]
+  - @o2s/ui@1.7.1
+
 ## 1.2.0
 
 ### Minor Changes
diff --git a/packages/blocks/orders-summary/package.json b/packages/blocks/orders-summary/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@o2s/blocks.orders-summary",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "private": false,
     "license": "MIT",
     "description": "A block displaying a summary of orders, including statistics and recent activity.",
diff --git a/packages/blocks/orders-summary/src/frontend/OrdersSummary.client.tsx b/packages/blocks/orders-summary/src/frontend/OrdersSummary.client.tsx
@@ -146,7 +146,10 @@ export const OrdersSummaryPure: React.FC<Readonly<OrdersSummaryPureProps>> = ({
                     </div>
 
                     <div
-                        className={cn('w-full flex gap-6', data.chart.showChart ? 'flex-col lg:flex-row' : 'flex-col')}
+                        className={cn(
+                            'w-full grid gap-6',
+                            data.chart.showChart ? 'grid-cols-1 lg:grid-cols-2' : 'grid-cols-1',
+                        )}
                     >
                         {data.chart.showChart ? (
                             <>
diff --git a/packages/blocks/payments-summary/CHANGELOG.md b/packages/blocks/payments-summary/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @o2s/blocks.payments-summary
 
+## 1.1.3
+
+### Patch Changes
+
+- 0775ad9: aligned inner tiles to have equal heights
+- Updated dependencies [abd3b41]
+- Updated dependencies [be6f80b]
+- Updated dependencies [f999bb1]
+  - @o2s/ui@1.7.1
+
 ## 1.1.2
 
 ### Patch Changes
diff --git a/packages/blocks/payments-summary/package.json b/packages/blocks/payments-summary/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@o2s/blocks.payments-summary",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "private": false,
     "license": "MIT",
     "description": "A block displaying a summary of payments, including overdue and to-be-paid amounts.",
diff --git a/packages/blocks/payments-summary/src/frontend/PaymentsSummary.client.tsx b/packages/blocks/payments-summary/src/frontend/PaymentsSummary.client.tsx
@@ -35,13 +35,14 @@ export const PaymentsSummaryPure: React.FC<PaymentsSummaryPureProps> = ({ routin
     }
 
     const showChart = chart?.showChart ?? false;
-    const cardsLayout = layout === 'horizontal' ? 'flex-col md:flex-row' : 'flex-col';
+    const cardsOuterLayout = layout === 'horizontal' ? 'grid-cols-1 md:grid-cols-2' : 'grid-cols-1';
+    const cardsInnerLayout = layout === 'horizontal' ? 'flex-col md:flex-row' : 'flex-col';
 
     return (
-        <div className={cn('w-full flex gap-6', showChart ? 'flex-col lg:flex-row' : cardsLayout)}>
+        <div className={cn('w-full grid gap-6', showChart ? 'grid-cols-1 lg:grid-cols-2' : cardsOuterLayout)}>
             {showChart ? (
                 <>
-                    <div className={cn('w-full flex gap-6', cardsLayout)}>
+                    <div className={cn('w-full flex gap-6', cardsInnerLayout)}>
                         {overdue && (
                             <InfoCard
                                 title={overdue.title}
diff --git a/packages/blocks/pricing-section/package.json b/packages/blocks/pricing-section/package.json
@@ -27,7 +27,7 @@
         "@o2s/configs.integrations": "*"
     },
     "devDependencies": {
-        "dotenv-cli": "^10.0.0",
+        "dotenv-cli": "^11.0.0",
         "@o2s/eslint-config": "*",
         "@o2s/prettier-config": "*",
         "@o2s/typescript-config": "*",
diff --git a/packages/integrations/algolia/package.json b/packages/integrations/algolia/package.json
@@ -17,7 +17,7 @@
     "dependencies": {
         "@o2s/framework": "*",
         "@o2s/utils.logger": "*",
-        "algoliasearch": "^5.44.0"
+        "algoliasearch": "^5.46.0"
     },
     "devDependencies": {
         "@o2s/eslint-config": "*",
diff --git a/packages/integrations/contentful-cms/package.json b/packages/integrations/contentful-cms/package.json
@@ -17,10 +17,10 @@
         "generate": "graphql-codegen && prettier --write \"generated/**/*.{ts,tsx}\""
     },
     "dependencies": {
-        "@contentful/live-preview": "^4.7.0",
+        "@contentful/live-preview": "^4.8.2",
         "@o2s/framework": "*",
         "@o2s/utils.logger": "*",
-        "contentful": "^11.0.0",
+        "contentful": "^11.9.0",
         "flatted": "^3.3.3",
         "graphql": "16.12.0",
         "graphql-request": "7.3.5",
diff --git a/packages/integrations/medusajs/package.json b/packages/integrations/medusajs/package.json
@@ -15,8 +15,8 @@
     "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,scss,json}\""
   },
   "dependencies": {
-    "@medusajs/js-sdk": "^2.11.3",
-    "@medusajs/types": "^2.11.3",
+    "@medusajs/js-sdk": "^2.12.1",
+    "@medusajs/types": "^2.12.1",
     "@o2s/framework": "*",
     "@o2s/utils.logger": "*"
   },
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @o2s/ui
 
+## 1.7.1
+
+### Patch Changes
+
+- abd3b41: added missing `getRowKey` prop that is passed down to inner components
+- be6f80b: fixed incorrect price mapping
+- f999bb1: extended `Collapsible` component with an option to define whether it's open by default
+
 ## 1.7.0
 
 ### Minor Changes
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@o2s/ui",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "private": true,
     "license": "MIT",
     "exports": {
@@ -63,7 +63,9 @@
         "clsx": "^2.1.1",
         "cmdk": "^1.1.1",
         "date-fns": "^4.1.0",
-        "lucide-react": "^0.555.0",
+        "input-format": "^0.3.14",
+        "libphonenumber-js": "^1.12.31",
+        "lucide-react": "^0.556.0",
         "markdown-to-jsx": "^8.0.0",
         "react-day-picker": "^9.11.3",
         "react-indiana-drag-scroll": "^2.2.1",
diff --git a/packages/ui/src/components/DataView/DataView.types.ts b/packages/ui/src/components/DataView/DataView.types.ts
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { DataListActionsConfig, DataListColumnConfig } from '../DataList/DataList.types';
+import { DataListActionsConfig, DataListColumnConfig, DataListProps } from '../DataList';
 
 export interface DataViewProps<T> {
     viewMode: 'grid' | 'list';
@@ -18,10 +18,10 @@ export interface DataViewProps<T> {
     data: T[];
     columns: DataListColumnConfig<T>[];
     actions?: DataListActionsConfig<T>;
-    getRowKey?: (item: T, index: number) => string | number;
     enableRowSelection?: boolean;
     selectedRows?: Set<string | number>;
     onSelectionChange?: (selected: Set<string | number>) => void;
     bulkActions?: (selectedRowKeys: Set<string | number>) => ReactNode;
     bulkActionsLabel?: (count: number) => string;
+    getRowKey?: DataListProps<T>['getRowKey'];
 }
diff --git a/packages/ui/src/elements/phone-input-metadata.ts b/packages/ui/src/elements/phone-input-metadata.ts
diff --git a/packages/ui/src/elements/phone-input.stories.tsx b/packages/ui/src/elements/phone-input.stories.tsx
diff --git a/packages/ui/src/elements/phone-input.tsx b/packages/ui/src/elements/phone-input.tsx
diff --git a/packages/ui/src/elements/phone-input.types.ts b/packages/ui/src/elements/phone-input.types.ts
diff --git a/packages/ui/src/lib/renderCell.tsx b/packages/ui/src/lib/renderCell.tsx
