From e2e454d339b8b523ec051adcb4e91b5f8672683c Mon Sep 17 00:00:00 2001 From: mario Date: Wed, 2 Apr 2025 11:19:40 +0700 Subject: [PATCH] bypass choosing google dicomstore --- .../DataSourceConfigurationComponent.tsx | 11 +++++++ platform/app/public/config/google.js | 30 +++++++++++++++---- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/extensions/default/src/Components/DataSourceConfigurationComponent.tsx b/extensions/default/src/Components/DataSourceConfigurationComponent.tsx index dd61dc5..9d262bf 100644 --- a/extensions/default/src/Components/DataSourceConfigurationComponent.tsx +++ b/extensions/default/src/Components/DataSourceConfigurationComponent.tsx @@ -18,6 +18,9 @@ function DataSourceConfigurationComponent({ const [configuredItems, setConfiguredItems] = useState>(); + const [dicomStoreConfiguredItems, setDicomStoreConfiguredItems] = useState(); + + useEffect(() => { let shouldUpdate = true; @@ -28,6 +31,9 @@ function DataSourceConfigurationComponent({ return; } + // Tambahan untuk ambil defaultDicomStoreConfiguredItems dari config + setDicomStoreConfiguredItems(activeDataSourceDef.configuration.defaultDicomStoreConfiguredItems); + const { factory: configurationAPIFactory } = customizationService.get(activeDataSourceDef.configuration.configurationAPI) ?? {}; @@ -78,6 +84,11 @@ function DataSourceConfigurationComponent({ return; } + // Tambahkan dicomStoreConfiguredItems ke configuredItems + if (!configuredItems.some(item => item.id === dicomStoreConfiguredItems.id)) { + setConfiguredItems(prevItems => [...prevItems, dicomStoreConfiguredItems]); + } + if (configuredItems.length !== configurationAPI.getItemLabels().length) { // Not the correct number of configured items, so show the modal to configure the data source. showConfigurationModal(); diff --git a/platform/app/public/config/google.js b/platform/app/public/config/google.js index 08799ff..bdbdd16 100644 --- a/platform/app/public/config/google.js +++ b/platform/app/public/config/google.js @@ -13,7 +13,7 @@ window.config = { // ~ REQUIRED // Authorization Server URL authority: 'https://accounts.google.com', - client_id: '723928408739-k9k9r3i44j32rhu69vlnibipmmk9i57p.apps.googleusercontent.com', + client_id: '382212153306-7q39hdie4ecj0uhemkitvedo93bnvfhn.apps.googleusercontent.com', redirect_uri: '/callback', response_type: 'id_token token', scope: @@ -23,6 +23,20 @@ window.config = { 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" + ] }, ], extensions: [], @@ -38,20 +52,26 @@ window.config = { friendlyName: 'dcmjs DICOMWeb Server', name: 'GCP', wadoUriRoot: - 'https://healthcare.googleapis.com/v1/projects/ohif-cloud-healthcare/locations/us-east4/datasets/ohif-qa-dataset/dicomStores/ohif-qa-2/dicomWeb', + '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/ohif-cloud-healthcare/locations/us-east4/datasets/ohif-qa-dataset/dicomStores/ohif-qa-2/dicomWeb', + '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/ohif-cloud-healthcare/locations/us-east4/datasets/ohif-qa-dataset/dicomStores/ohif-qa-2/dicomWeb', + 'https://healthcare.googleapis.com/v1/projects/westone-433204/locations/asia-southeast2/datasets/sas-dicom-storage/dicomStores/ohif/dicomWeb', qidoSupportsIncludeField: true, imageRendering: 'wadors', thumbnailRendering: 'wadors', enableStudyLazyLoad: true, supportsFuzzyMatching: true, - supportsWildcard: false, + supportsWildcard: true, 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' + }, }, }, {