{message}
diff --git a/platform/app/package.json b/platform/app/package.json index 49e9c7c90..815ec6c22 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -53,7 +53,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^3.9.4", + "@cornerstonejs/dicom-image-loader": "^3.9.5", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.10.0-beta.158", "@ohif/extension-cornerstone": "3.10.0-beta.158", diff --git a/platform/app/public/config/default.js b/platform/app/public/config/default.js index b9bf87148..eb9dc2b24 100644 --- a/platform/app/public/config/default.js +++ b/platform/app/public/config/default.js @@ -276,7 +276,6 @@ window.config = { console.warn('test, navigate to https://ohif.org/'); }, // whiteLabeling: { - // /* Optional: Should return a React component to be rendered in the "Logo" section of the application's Top Navigation bar */ // createLogoComponentFn: function (React) { // return React.createElement( // 'a', @@ -284,14 +283,13 @@ window.config = { // target: '_self', // rel: 'noopener noreferrer', // className: 'text-purple-600 line-through', - // href: '/', + // href: '_X___IDC__LOGO__LINK___Y_', // }, - // React.createElement('img', - // { - // src: './assets/customLogo.svg', - // className: 'w-8 h-8', - // } - // )) + // React.createElement('img', { + // src: './Logo.svg', + // className: 'w-14 h-14', + // }) + // ); // }, // }, }; diff --git a/platform/core/package.json b/platform/core/package.json index 2ee90f1a0..1b9241d32 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -37,8 +37,8 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/core": "^3.9.4", - "@cornerstonejs/dicom-image-loader": "^3.9.4", + "@cornerstonejs/core": "^3.9.5", + "@cornerstonejs/dicom-image-loader": "^3.9.5", "@ohif/ui": "3.10.0-beta.158", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/platform/core/src/classes/MetadataProvider.ts b/platform/core/src/classes/MetadataProvider.ts index 96d857496..7ee88898f 100644 --- a/platform/core/src/classes/MetadataProvider.ts +++ b/platform/core/src/classes/MetadataProvider.ts @@ -518,7 +518,7 @@ const WADO_IMAGE_LOADER = { // Fallback for DX images. // TODO: We should use the rest of the results of this function // to update the UI somehow - const { PixelSpacing, type } = getPixelSpacingInformation(instance); + const { PixelSpacing, type } = getPixelSpacingInformation(instance) || {}; let rowPixelSpacing; let columnPixelSpacing; diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/General/commands.md b/platform/docs/docs/migration-guide/3p9-to-3p10/1-General/commands.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/General/commands.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/1-General/commands.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/General/general-m.md b/platform/docs/docs/migration-guide/3p9-to-3p10/1-General/general-m.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/General/general-m.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/1-General/general-m.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/General/hotkeys.md b/platform/docs/docs/migration-guide/3p9-to-3p10/1-General/hotkeys.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/General/hotkeys.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/1-General/hotkeys.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/1-General/routerBaseName.md b/platform/docs/docs/migration-guide/3p9-to-3p10/1-General/routerBaseName.md new file mode 100644 index 000000000..de39916ac --- /dev/null +++ b/platform/docs/docs/migration-guide/3p9-to-3p10/1-General/routerBaseName.md @@ -0,0 +1,55 @@ +--- +title: routerBaseName +--- + + +## Migration Guide: Router Configuration (`routerBasename` and `PUBLIC_URL`) + + +**Key Changes:** + +* **`routerBasename` Default Value:** The recommended default value for `routerBasename` in the configuration file (`window.config`) has changed from `'/'` to `null`. +* **New Default Behavior:** If `routerBasename` is set to `null` (or is not defined) in the configuration, the application's base path will now automatically default to the value determined by `PUBLIC_URL`. +* **Clarified Roles:** + * `routerBasename`: Explicitly defines the base path for the application's routes (e.g., `/viewer`). If `null`, it defaults to `PUBLIC_URL`. + * `PUBLIC_URL`: Primarily defines the URL prefix from which static assets (like JavaScript files, CSS, images) are loaded. It defaults to `/` if not set. + + +:::info +see the comprehensive guide [here](/deployment/custom-url-access) +::: + +**Migration Steps:** + +1. **Review `routerBasename` Configuration:** + Locate the `routerBasename` setting within your application configuration file (typically found in `platform/app/public/config/*.js`). + +2. **Update `routerBasename` Based on Hosting Scenario:** + + * **Scenario A: Hosting at the Root (`/`)** + If your application is served from the root domain (e.g., `https://example.com/`), it's recommended to update `routerBasename` to `null`. This aligns the routing base with the default asset loading path (`PUBLIC_URL` which defaults to `/`). + + *Example Diff:* + ```diff + window.config = { + - routerBasename: '/', + + routerBasename: null, + // ... other config options + showStudyList: true, + dataSources: [ /* ... */ ], + ``` + *Explanation:* Setting `routerBasename: null` leverages the new default behavior. The router will use `/` as its base because `PUBLIC_URL` defaults to `/`. + + * **Scenario B: Hosting at a Subpath (e.g., `/viewer/`)** + If your application is served from a subpath (e.g., `https://example.com/viewer/`), you should ensure `routerBasename` is explicitly set to that path. + + *Example (No Change Needed if Already Correct):* + ```diff + window.config = { + // No change needed if already set correctly for subpath hosting + routerBasename: '/viewer', + // ... other config options + showStudyList: true, + dataSources: [ /* ... */ ], + ``` + *Explanation:* Explicitly setting `routerBasename` ensures the application's internal routing works correctly under the `/viewer/` path. diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/CustomizationService/index.md b/platform/docs/docs/migration-guide/3p9-to-3p10/2-CustomizationService/index.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/CustomizationService/index.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/2-CustomizationService/index.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/1-Introduction.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/1-Introduction.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/1-Introduction.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/1-Introduction.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/10-Migration-3p10-Tests.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/10-Migration-3p10-Tests.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/10-Migration-3p10-Tests.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/10-Migration-3p10-Tests.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/1a-Colors.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/1a-Colors.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/1a-Colors.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/1a-Colors.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/2-Migration-3p10-Icons.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/2-Migration-3p10-Icons.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/2-Migration-3p10-Icons.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/2-Migration-3p10-Icons.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/2a-Migration-3p10-Button.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/2a-Migration-3p10-Button.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/2a-Migration-3p10-Button.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/2a-Migration-3p10-Button.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/3-Migration-3p10-Input.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/3-Migration-3p10-Input.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/3-Migration-3p10-Input.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/3-Migration-3p10-Input.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/4-Migration-3p10-Tooltip.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/4-Migration-3p10-Tooltip.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/4-Migration-3p10-Tooltip.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/4-Migration-3p10-Tooltip.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/4a-Migration-3p10-Select.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/4a-Migration-3p10-Select.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/4a-Migration-3p10-Select.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/4a-Migration-3p10-Select.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/4a-Migration-3p10-Switch.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/4a-Migration-3p10-Switch.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/4a-Migration-3p10-Switch.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/4a-Migration-3p10-Switch.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/5-Migration-3p10-Toolbar.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/5-Migration-3p10-Toolbar.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/5-Migration-3p10-Toolbar.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/5-Migration-3p10-Toolbar.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/6-Migration-3p10-SegmentationTable.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/6-Migration-3p10-SegmentationTable.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/6-Migration-3p10-SegmentationTable.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/6-Migration-3p10-SegmentationTable.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/7-Migration-3p10-Tours.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/7-Migration-3p10-Tours.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/7-Migration-3p10-Tours.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/7-Migration-3p10-Tours.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/8-Migration-3p10-DialogService.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/8-Migration-3p10-DialogService.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/8-Migration-3p10-DialogService.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/8-Migration-3p10-DialogService.md diff --git a/platform/docs/docs/migration-guide/3p9-to-3p10/UI/9-Migration-3p10-ModalService.md b/platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/9-Migration-3p10-ModalService.md similarity index 100% rename from platform/docs/docs/migration-guide/3p9-to-3p10/UI/9-Migration-3p10-ModalService.md rename to platform/docs/docs/migration-guide/3p9-to-3p10/3-UI/9-Migration-3p10-ModalService.md diff --git a/platform/docs/src/pages/components-list.tsx b/platform/docs/src/pages/components-list.tsx index cd9a57ae9..48ca2a0b4 100644 --- a/platform/docs/src/pages/components-list.tsx +++ b/platform/docs/src/pages/components-list.tsx @@ -34,7 +34,6 @@ export default function ComponentsList() {