2 Commits

Author SHA1 Message Date
mario
e7b2965cef adjust scroll area expertise | deploy sudirman 2025-06-11 19:50:25 +07:00
mario
860a738734 ganti google.js ke proxy cloud-pacs 2025-05-02 16:27:56 +07:00
5 changed files with 42 additions and 62 deletions

1
.gitignore vendored
View File

@@ -59,3 +59,4 @@ tests/playwright-report/
# Dummy
/dump
platform/app/dist.zip

View File

@@ -146,6 +146,7 @@ function ViewerLayout({
side="right"
activeTabIndex={rightPanelClosedState ? null : 0}
servicesManager={servicesManager}
expandedWidth={400}
/>
) : null}
</React.Fragment>

View File

@@ -24,22 +24,10 @@ window.config = {
prefetch: 25,
},
expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
expertise_host: `http://192.168.1.29`, //* Tambahan untuk fetch data Expertise)
pacs_document_host: `192.168.1.29`,
expertise_host: `http://192.168.2.13`, // IP ke NV di PACS Server, untuk fetch expertise bawaan versi NV
pacs_document_host: `192.168.2.13`, // IP ke NV di PACS Server untuk ambil pdf
pacs_document_port: 8080,
// filterQueryParam: false,
// defaultDataSourceName: 'dicomweb',
defaultDataSourceName: 'local-proxy',
/* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */
// dangerouslyUseDynamicConfig: {
// enabled: true,
// // regex will ensure valid configuration source and default is /.*/ which matches any character. To use this, setup your own regex to choose a specific source of configuration only.
// // Example 1, to allow numbers and letters in an absolute or sub-path only.
// // regex: /(0-9A-Za-z.]+)(\/[0-9A-Za-z.]+)*/
// // Example 2, to restricts to either hosptial.com or othersite.com.
// // regex: /(https:\/\/hospital.com(\/[0-9A-Za-z.]+)*)|(https:\/\/othersite.com(\/[0-9A-Za-z.]+)*)/
// regex: /.*/,
// },
dataSources: [
{
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
@@ -47,9 +35,8 @@ window.config = {
configuration: {
friendlyName: 'Static WADO Local Data',
name: 'DCM4CHEE',
qidoRoot: `http://192.168.1.29:5000/rs`,
wadoRoot: `http://192.168.1.29:5000/rs`,
qidoSupportsIncludeField: false,
qidoRoot: `http://192.168.2.13:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs
wadoRoot: `http://192.168.2.13:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs qidoSupportsIncludeField: false,
supportsReject: true,
supportsStow: true,
imageRendering: 'wadors',

View File

@@ -1,7 +1,7 @@
/** @type {AppTypes.Config} */
window.config = {
routerBasename: '/',
pacs_document_host: `${window.location.hostname}`,
pacs_document_host: '152.42.173.210',
pacs_document_port: 8080,
expertise: false,
enableGoogleCloudAdapter: false,
@@ -11,35 +11,24 @@ window.config = {
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// This is an array, but we'll only use the first entry for now
oidc: [
{
// ~ REQUIRED
// Authorization Server URL
authority: 'https://accounts.google.com',
client_id: '382212153306-7q39hdie4ecj0uhemkitvedo93bnvfhn.apps.googleusercontent.com',
redirect_uri: '/callback',
response_type: 'id_token token',
scope:
'email profile openid https://www.googleapis.com/auth/cloudplatformprojects.readonly https://www.googleapis.com/auth/cloud-healthcare', // email profile openid
// ~ OPTIONAL
post_logout_redirect_uri: '/logout-redirect.html',
revoke_uri: 'https://accounts.google.com/o/oauth2/revoke?token=',
automaticSilentRenew: true,
revokeAccessTokenOnSignout: true,
// Tambahan dari Google CLoud Secret
project_id: 'westone-433204',
auth_uri: 'https://accounts.google.com/o/oauth2/auth',
token_uri: 'https://oauth2.googleapis.com/token',
auth_provider_x509_cert_url: 'https://www.googleapis.com/oauth2/v1/certs',
client_secret: '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',
redirect_uris: ['http://devkedungdoro.aplikasi.web.id:3000/callback'],
javascript_origins: [
'https://devone.aplikasi.web.id',
'http://devkedungdoro.aplikasi.web.id:3000',
],
},
],
// Remove OIDC configuration since proxy handles authentication
// oidc: [
// {
// // ~ REQUIRED
// // Authorization Server URL
// authority: 'https://accounts.google.com',
// client_id: '382212153306-7q39hdie4ecj0uhemkitvedo93bnvfhn.apps.googleusercontent.com',
// redirect_uri: '/callback',
// response_type: 'id_token token',
// scope:
// 'email profile openid https://www.googleapis.com/auth/cloudplatformprojects.readonly https://www.googleapis.com/auth/cloud-healthcare', // email profile openid
// // ~ OPTIONAL
// post_logout_redirect_uri: '/logout-redirect.html',
// revoke_uri: 'https://accounts.google.com/o/oauth2/revoke?token=',
// automaticSilentRenew: true,
// revokeAccessTokenOnSignout: true,
// },
// ],
extensions: [],
modes: [],
showStudyList: true,
@@ -52,12 +41,9 @@ window.config = {
configuration: {
friendlyName: 'dcmjs DICOMWeb Server',
name: 'GCP',
wadoUriRoot:
'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif/dicomWeb',
qidoRoot:
'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif/dicomWeb',
wadoRoot:
'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif/dicomWeb',
wadoUriRoot: `http://152.42.173.210:5555/dicomWeb`,
qidoRoot: `http://152.42.173.210:5555/dicomWeb`,
wadoRoot: `http://152.42.173.210:5555/dicomWeb`,
qidoSupportsIncludeField: true,
imageRendering: 'wadors',
thumbnailRendering: 'wadors',
@@ -67,12 +53,12 @@ window.config = {
dicomUploadEnabled: true,
omitQuotationForMultipartRequest: true,
configurationAPI: 'ohif.dataSourceConfigurationAPI.google',
defaultDicomStoreConfiguredItems: {
id: 'projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage',
itemType: '3',
name: 'ohif',
url: 'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif',
},
// defaultDicomStoreConfiguredItems: {
// id: 'projects/ohifproxy/locations/asia-southeast2/datasets/sas-storage',
// itemType: '3',
// name: 'store-1',
// url: 'https://healthcare.googleapis.com/v1/projects/ohifproxy/locations/asia-southeast2/datasets/sas-storage/dicomStores/store-1'
// },
},
},
{

View File

@@ -441,7 +441,7 @@ const SidePanel = ({
});
return (
<ScrollArea className="border-input bg-background h-[500px] w-[350px] rounded-md border p-2 text-sm text-white">
<ScrollArea className="border-input bg-background h-[500px] w-full rounded-md border p-2 text-sm text-white">
<h3 className="mb-4 text-lg font-bold">Expertise</h3>
{formattedData.map((section, index) => (
<div
@@ -452,11 +452,16 @@ const SidePanel = ({
{Array.isArray(section.value) ? (
<ul className="list-disc pl-6">
{section.value.map((item, idx) => (
<li key={idx}>{item}</li>
<li
key={idx}
className="break-words"
>
{item}
</li>
))}
</ul>
) : (
<p>{section.value}</p>
<p className="break-words">{section.value}</p>
)}
</div>
))}