Skip to content

Commit ded30bb

Browse files
Merge branch 'main' into extend-request
2 parents c2cc391 + e1f65c6 commit ded30bb

7 files changed

Lines changed: 51 additions & 7 deletions

File tree

packages/apps/storybook/.storybook/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
"storybook-dark-mode/register",
1111
"@storybook/addon-links",
1212
"@storybook/addon-essentials",
13-
"@itwin/storybook-auth-addon",
13+
"../../../modules/storybook-auth-addon/register.js",
1414
"../src/addon/register.js",
1515
],
1616
reactOptions: { fastRefresh: true },
@@ -30,4 +30,5 @@ module.exports = {
3030
// Return the altered config
3131
return config;
3232
},
33+
staticDirs: ["../../../modules/storybook-auth-addon/build"]
3334
};

packages/apps/storybook/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
"webpack": "^5.28.0"
4949
},
5050
"scripts": {
51-
"start": "start-storybook -s ./node_modules/@itwin/storybook-auth-addon/build -p 6006",
51+
"start": "start-storybook -p 6006",
5252
"build": "",
53-
"test": "build-storybook -s ./node_modules/@itwin/storybook-auth-addon/build --loglevel error --quiet",
53+
"test": "build-storybook --loglevel error --quiet",
5454
"clean": "rimraf storybook-static"
5555
}
5656
}

packages/modules/imodel-browser/CHANGELOG.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,30 @@
11
{
22
"name": "@itwin/imodel-browser-react",
33
"entries": [
4+
{
5+
"version": "3.0.3",
6+
"tag": "@itwin/imodel-browser-react_v3.0.3",
7+
"date": "Thu, 17 Apr 2025 16:41:30 GMT",
8+
"comments": {
9+
"patch": [
10+
{
11+
"comment": "fix error when searching itwin"
12+
}
13+
]
14+
}
15+
},
16+
{
17+
"version": "3.0.2",
18+
"tag": "@itwin/imodel-browser-react_v3.0.2",
19+
"date": "Thu, 17 Apr 2025 14:42:55 GMT",
20+
"comments": {
21+
"patch": [
22+
{
23+
"comment": "Fix iModelBrowser menu items opening the iModel in table view"
24+
}
25+
]
26+
}
27+
},
428
{
529
"version": "3.0.1",
630
"tag": "@itwin/imodel-browser-react_v3.0.1",

packages/modules/imodel-browser/CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
# Change Log - @itwin/imodel-browser-react
22

3-
This log was last generated on Mon, 14 Apr 2025 18:32:24 GMT and should not be manually modified.
3+
This log was last generated on Thu, 17 Apr 2025 16:41:30 GMT and should not be manually modified.
4+
5+
## 3.0.3
6+
Thu, 17 Apr 2025 16:41:30 GMT
7+
8+
### Patches
9+
10+
- fix error when searching itwin
11+
12+
## 3.0.2
13+
Thu, 17 Apr 2025 14:42:55 GMT
14+
15+
### Patches
16+
17+
- Fix iModelBrowser menu items opening the iModel in table view
418

519
## 3.0.1
620
Mon, 14 Apr 2025 18:32:24 GMT

packages/modules/imodel-browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@itwin/imodel-browser-react",
33
"description": "Components that let the user browse the iModels of a context and select one.",
44
"repository": "https://github.com/iTwin/admin-components-react/tree/main/packages/modules/imodel-browser",
5-
"version": "3.0.1",
5+
"version": "3.0.3",
66
"main": "cjs/index.js",
77
"module": "esm/index.js",
88
"types": "cjs/index.d.ts",

packages/modules/imodel-browser/src/containers/ITwinGrid/useITwinData.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export const useITwinData = ({
109109
const search =
110110
["favorites", "recents"].includes(requestType) || !filterOptions
111111
? ""
112-
: `&$search=${filterOptions}`;
112+
: `&$search=${encodeURIComponent(String(filterOptions).trim())}`;
113113
const url = `${_getAPIServer(
114114
serverEnvironmentPrefix
115115
)}/itwins/${endpoint}${subClass}${paging}${search}`;

packages/modules/imodel-browser/src/containers/iModelGrid/useIModelTableConfig.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,12 @@ export const useIModelTableConfig = ({
9292
};
9393

9494
return iModelActions && iModelActions.length > 0 ? (
95-
<DropdownMenu menuItems={moreOptions}>
95+
<DropdownMenu
96+
menuItems={moreOptions}
97+
onClick={(e) => {
98+
e.stopPropagation();
99+
}}
100+
>
96101
<IconButton
97102
styleType="borderless"
98103
aria-label="More options"

0 commit comments

Comments
 (0)