Skip to content

Commit 166986b

Browse files
authored
Merge branch 'main' into copilot/update-action-step-reference
2 parents 530c25a + 7d06684 commit 166986b

9 files changed

Lines changed: 38 additions & 18 deletions

File tree

apps/console/src/mocks/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function createHandlers(baseUrl: string, kernel: ObjectKernel, driver: InMemoryD
165165
// Try simple find first
166166
const records = await driver.find(params.objectName as string, {
167167
object: params.objectName as string,
168-
where: ['_id', '=', params.id]
168+
where: [['_id', '=', params.id]]
169169
});
170170
// Manual filter to ensure we get the correct record if driver ignores filters
171171
const record = records ? records.find((r: any) => r.id === params.id || r._id === params.id) : null;

packages/components/src/renderers/data-display/list.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
import { ComponentRegistry } from '@object-ui/core';
10-
import compact from 'lodash/compact';
119
import { ComponentRegistry } from '@object-ui/core';
1210
import type { ListSchema } from '@object-ui/types';
1311
import { useDataScope } from '@object-ui/react';
14-
import { renderChildren } from '../../lib/utils';
15-
import { cn } from '../../lib/utils';
12+
import { renderChildren, cn } from '../../lib/utils';
1613

1714
ComponentRegistry.register('list',
1815
({ schema, className, ...props }: { schema: ListSchema; className?: string; [key: string]: any }) => {

packages/fields/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default defineConfig({
4343
},
4444
test: {
4545
globals: true,
46-
environment: 'happy-dom',
46+
environment: 'jsdom',
4747
setupFiles: ['../../vitest.setup.ts'],
4848
passWithNoTests: true,
4949
},

packages/plugin-aggrid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@types/react-dom": "^19.2.3",
5050
"@vitejs/plugin-react": "^4.2.1",
5151
"ag-grid-community": "^32.3.9",
52-
"ag-grid-react": "^35.0.1",
52+
"ag-grid-react": "^32.3.9",
5353
"typescript": "^5.9.3",
5454
"vite": "^7.3.1",
5555
"vite-plugin-dts": "^4.5.4"

packages/plugin-calendar/src/ObjectCalendar.msw.test.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,15 @@ const server = setupServer(...handlers);
5656
// --- Test Suite ---
5757

5858
describe('ObjectCalendar with MSW', () => {
59-
if (!process.env.OBJECTSTACK_API_URL) {
60-
beforeAll(() => server.listen());
61-
afterEach(() => server.resetHandlers());
62-
afterAll(() => server.close());
63-
}
64-
65-
const dataSource = new ObjectStackAdapter({
66-
baseUrl: BASE_URL,
67-
});
59+
beforeAll(() => server.listen());
60+
afterEach(() => server.resetHandlers());
61+
afterAll(() => server.close());
6862

6963
it('fetches events and renders them', async () => {
64+
const dataSource = new ObjectStackAdapter({
65+
baseUrl: BASE_URL,
66+
});
67+
7068
render(
7169
<ObjectCalendar
7270
schema={{

packages/plugin-calendar/vite.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,7 @@ export default defineConfig({
4949
},
5050
test: {
5151
passWithNoTests: true,
52+
globals: true,
53+
environment: 'jsdom',
5254
},
5355
});

packages/plugin-timeline/vite.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,7 @@ export default defineConfig({
5050
environment: 'happy-dom',
5151
setupFiles: ['../../vitest.setup.ts'],
5252
passWithNoTests: true,
53+
globals: true,
54+
environment: 'jsdom',
5355
},
5456
});

pnpm-lock.yaml

Lines changed: 15 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vitest.setup.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@
77
*/
88

99
import '@testing-library/jest-dom';
10+
11+
// Polyfill ResizeObserver for Radix UI (Shadcn) components
12+
global.ResizeObserver = class ResizeObserver {
13+
observe() {}
14+
unobserve() {}
15+
disconnect() {}
16+
};
17+

0 commit comments

Comments
 (0)