Merge branch 'main' of https://github.com/iTwin/admin-components-react …

…into nm/acessible-tiles
iTwin · Jan 16, 2025 · 288c458 · 288c458
2 parents 921b8c2 + 50fc03b
commit 288c458
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 6 deletions.
diff --git a/packages/apps/storybook/.env b/packages/apps/storybook/.env
@@ -1,3 +1,3 @@
-# Registered client which have access to scopes "imodels:read", "imodels:modify", "itwins:read" and "itwins:modify", redirectUrl should be http://localhost:6006/signin-oidc.html
+# Registered client which has access to the "itwin-platform" scope, redirectUrl should be http://localhost:6006/signin-oidc.html
 # Please create .env.local file and put the client id there to avoid accidentally commiting this file.
 STORYBOOK_AUTH_CLIENT_ID=
diff --git a/packages/apps/storybook/package.json b/packages/apps/storybook/package.json
@@ -12,7 +12,7 @@
     "@itwin/create-imodel-react": "^2.0.0",
     "@itwin/delete-imodel-react": "^2.0.0",
     "@itwin/delete-itwin-react": "^2.0.0",
-    "@itwin/imodel-browser-react": "~2.2.1",
+    "@itwin/imodel-browser-react": "~2.3.0",
     "@itwin/itwinui-react": "^2.12.18",
     "@itwin/manage-versions-react": "~2.0.0",
     "@itwin/storybook-auth-addon": "^0.1.0",

diff --git a/packages/apps/storybook/src/imodel-browser/ITwinGrid.stories.tsx b/packages/apps/storybook/src/imodel-browser/ITwinGrid.stories.tsx
@@ -299,3 +299,9 @@ export const WithPostProcessCallback: Story<ITwinGridProps> =
 WithPostProcessCallback.args = {
   apiOverrides: { serverEnvironmentPrefix: "qa" },
 };
+
+export const FetchAllSubclasses = Template.bind({});
+FetchAllSubclasses.args = {
+  apiOverrides: { serverEnvironmentPrefix: "qa" },
+  iTwinSubClass: "All",
+};
diff --git a/packages/modules/imodel-browser/CHANGELOG.json b/packages/modules/imodel-browser/CHANGELOG.json
@@ -1,6 +1,30 @@
 {
   "name": "@itwin/imodel-browser-react",
   "entries": [
+    {
+      "version": "2.3.0",
+      "tag": "@itwin/imodel-browser-react_v2.3.0",
+      "date": "Wed, 15 Jan 2025 16:32:32 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "add ITwinSubClass \"All\" option to fetch all itwins regardless of subclass"
+          }
+        ]
+      }
+    },
+    {
+      "version": "2.2.2",
+      "tag": "@itwin/imodel-browser-react_v2.2.2",
+      "date": "Fri, 10 Jan 2025 14:12:35 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "added accessibility to grid tiles"
+          }
+        ]
+      }
+    },
     {
       "version": "2.2.1",
       "tag": "@itwin/imodel-browser-react_v2.2.1",

diff --git a/packages/modules/imodel-browser/CHANGELOG.md b/packages/modules/imodel-browser/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Change Log - @itwin/imodel-browser-react
 
-This log was last generated on Thu, 09 Jan 2025 03:49:28 GMT and should not be manually modified.
+This log was last generated on Wed, 15 Jan 2025 16:32:32 GMT and should not be manually modified.
+
+## 2.3.0
+Wed, 15 Jan 2025 16:32:32 GMT
+
+### Minor changes
+
+- add ITwinSubClass "All" option to fetch all itwins regardless of subclass
+
+## 2.2.2
+Fri, 10 Jan 2025 14:12:35 GMT
+
+### Patches
+
+- added accessibility to grid tiles
 
 ## 2.2.1
 Thu, 09 Jan 2025 03:49:28 GMT

diff --git a/packages/modules/imodel-browser/package.json b/packages/modules/imodel-browser/package.json
@@ -2,7 +2,7 @@
   "name": "@itwin/imodel-browser-react",
   "description": "Components that let the user browse the iModels of a context and select one.",
   "repository": "https://github.com/iTwin/admin-components-react/tree/main/packages/modules/imodel-browser",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "cjs/index.d.ts",

diff --git a/packages/modules/imodel-browser/src/containers/ITwinGrid/useITwinData.ts b/packages/modules/imodel-browser/src/containers/ITwinGrid/useITwinData.ts
@@ -103,7 +103,8 @@ export const useITwinData = ({
     const endpoint = ["favorites", "recents"].includes(requestType)
       ? requestType
       : "";
-    const subClass = `?subClass=${iTwinSubClass}`;
+    const resolvedITwinSubClass = iTwinSubClass === "All" ? "" : iTwinSubClass;
+    const subClass = `?subClass=${resolvedITwinSubClass}`;
     const paging = `&$skip=${page * PAGE_SIZE}&$top=${PAGE_SIZE}`;
     const search =
       ["favorites", "recents"].includes(requestType) || !filterOptions

diff --git a/packages/modules/imodel-browser/src/types.ts b/packages/modules/imodel-browser/src/types.ts
@@ -82,7 +82,8 @@ export type ITwinSubClass =
   | "Asset"
   | "Portfolio"
   | "Program"
-  | "WorkPackage";
+  | "WorkPackage"
+  | "All";
 export type ITwinClassType = "Thing" | "Endeavor";
 export type ITwinStatus =
   | "Active"