adjust scroll area expertise | deploy sudirman

ganti google.js ke proxy cloud-pacs
seversi dengan hangtuah
2025-06-17 18:24:18 +07:00 · 2025-05-02 16:27:56 +07:00 · 2025-04-30 08:10:22 +07:00 · 2025-04-15 03:11:46 +00:00 · 2025-04-14 11:24:36 +07:00
8 changed files with 85 additions and 204 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,5 @@ tests/playwright-report/

 # Dummy
 /dump
+platform/app/dist.zip
+platform/app/dist-sudirman.zip
--- a/extensions/default/src/Components/SidePanelWithServices.tsx
+++ b/extensions/default/src/Components/SidePanelWithServices.tsx
@@ -26,6 +26,8 @@ const SidePanelWithServices = ({
  const [sidePanelOpen, setSidePanelOpen] = useState(activeTabIndexProp !== null);
  const [activeTabIndex, setActiveTabIndex] = useState(activeTabIndexProp);
  const [tabs, setTabs] = useState(tabsProp ?? panelService.getPanels(side));
+  const [studyInstanceUID, setStudyInstanceUID] = useState('');
+  const [lastActivatedStudyUID, setLastActivatedStudyUID] = useState('');

  const handleActiveTabIndexChange = useCallback(({ activeTabIndex }) => {
    setActiveTabIndex(activeTabIndex);
@@ -71,23 +73,33 @@ const SidePanelWithServices = ({
    const activatePanelSubscription = panelService.subscribe(
      panelService.EVENTS.ACTIVATE_PANEL,
      (activatePanelEvent: Types.ActivatePanelEvent) => {
-        // Handle the `-exp` suffix logic
-        const isExpertisePanel = activatePanelEvent.panelId.endsWith('-exp');
+        const isExpertisePanel = activatePanelEvent.panelId.includes('-exp-');
        const realPanelID = isExpertisePanel
-          ? activatePanelEvent.panelId.replace(/-exp$/, '')
+          ? activatePanelEvent.panelId.split('-exp-')[0]
          : activatePanelEvent.panelId;

+        // studyInstanceUID = take from activatePanelEvent.panelId after '-exp-
+        setStudyInstanceUID(isExpertisePanel ? activatePanelEvent.panelId.split('-exp-')[1] : null);
+
        const tabIndex = tabs.findIndex(tab => tab.id === realPanelID);

        if (isExpertisePanel && side === 'right') {
-          const shouldOpen = !sidePanelOpen; // Use sidePanelOpen to determine toggle state
-          setSidePanelOpen(shouldOpen);
+         // Extract study UID from the panel ID
+         const currentStudyUID = activatePanelEvent.panelId.split('-exp-')[1];

-          if (shouldOpen) {
-            setActiveTabIndex(tabIndex !== -1 ? tabIndex : null);
-          } else {
-            setActiveTabIndex(null);
-          }
+         // Toggle logic - close if same study is clicked again, open if different study
+         if (currentStudyUID === lastActivatedStudyUID && sidePanelOpen) {
+           // Same study - close panel
+           setSidePanelOpen(false);
+           setActiveTabIndex(null);
+           setLastActivatedStudyUID('');
+         } else {
+           // Different study or panel was closed - open panel with new study
+           setSidePanelOpen(true);
+           setActiveTabIndex(tabIndex !== -1 ? tabIndex : null);
+           setStudyInstanceUID(currentStudyUID);
+           setLastActivatedStudyUID(currentStudyUID);
+         }
        } else if (tabIndex !== -1) {
          setActiveTabIndex(tabIndex);
        }
@@ -97,7 +109,7 @@ const SidePanelWithServices = ({
    return () => {
      activatePanelSubscription.unsubscribe();
    };
-  }, [tabs, sidePanelOpen, panelService]);
+  }, [tabs, sidePanelOpen, panelService, lastActivatedStudyUID]);

  return (
    <SidePanel
@@ -110,6 +122,7 @@ const SidePanelWithServices = ({
      onActiveTabIndexChange={handleActiveTabIndexChange}
      expandedWidth={expandedWidth}
      servicesManager={servicesManager} // Pass servicesManager ke SidePanel
+      studyInstanceUID={studyInstanceUID}
    />
  );
 };
--- a/extensions/default/src/ViewerLayout/index.tsx
+++ b/extensions/default/src/ViewerLayout/index.tsx
@@ -146,6 +146,7 @@ function ViewerLayout({
              side="right"
              activeTabIndex={rightPanelClosedState ? null : 0}
              servicesManager={servicesManager}
+              expandedWidth={400}
            />
          ) : null}
        </React.Fragment>
--- a/platform/app/public/config/default.js
+++ b/platform/app/public/config/default.js
@@ -23,116 +23,20 @@ window.config = {
    // above, the number of requests can be go a lot higher.
    prefetch: 25,
  },
-  expertise: true, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
-  // filterQueryParam: false,
-  // defaultDataSourceName: 'dicomweb',
+  expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
+  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,
  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',
-      sourceName: 'dicomweb',
-      configuration: {
-        friendlyName: 'AWS S3 Static wado server',
-        name: 'aws',
-        wadoUriRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
-        wadoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoSupportsIncludeField: false,
-        imageRendering: 'wadors',
-        thumbnailRendering: 'wadors',
-        enableStudyLazyLoad: true,
-        supportsFuzzyMatching: false,
-        supportsWildcard: true,
-        staticWado: true,
-        singlepart: 'bulkdata,video',
-        // whether the data source should use retrieveBulkData to grab metadata,
-        // and in case of relative path, what would it be relative to, options
-        // are in the series level or study level (some servers like series some study)
-        bulkDataURI: {
-          enabled: true,
-          relativeResolution: 'studies',
-          transform: url => url.replace('/pixeldata.mp4', '/rendered'),
-        },
-        omitQuotationForMultipartRequest: true,
-      },
-    },
-
-    {
-      namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
-      sourceName: 'ohif2',
-      configuration: {
-        friendlyName: 'AWS S3 Static wado secondary server',
-        name: 'aws',
-        wadoUriRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
-        wadoRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
-        qidoSupportsIncludeField: false,
-        supportsReject: false,
-        imageRendering: 'wadors',
-        thumbnailRendering: 'wadors',
-        enableStudyLazyLoad: true,
-        supportsFuzzyMatching: false,
-        supportsWildcard: true,
-        staticWado: true,
-        singlepart: 'bulkdata,video',
-        // whether the data source should use retrieveBulkData to grab metadata,
-        // and in case of relative path, what would it be relative to, options
-        // are in the series level or study level (some servers like series some study)
-        bulkDataURI: {
-          enabled: true,
-          relativeResolution: 'studies',
-        },
-        omitQuotationForMultipartRequest: true,
-      },
-    },
-    {
-      namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
-      sourceName: 'ohif3',
-      configuration: {
-        friendlyName: 'AWS S3 Static wado secondary server',
-        name: 'aws',
-        wadoUriRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
-        qidoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
-        wadoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
-        qidoSupportsIncludeField: false,
-        supportsReject: false,
-        imageRendering: 'wadors',
-        thumbnailRendering: 'wadors',
-        enableStudyLazyLoad: true,
-        supportsFuzzyMatching: false,
-        supportsWildcard: true,
-        staticWado: true,
-        singlepart: 'bulkdata,video',
-        // whether the data source should use retrieveBulkData to grab metadata,
-        // and in case of relative path, what would it be relative to, options
-        // are in the series level or study level (some servers like series some study)
-        bulkDataURI: {
-          enabled: true,
-          relativeResolution: 'studies',
-        },
-        omitQuotationForMultipartRequest: true,
-      },
-    },
-
    {
      namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
      sourceName: 'local-proxy',
      configuration: {
        friendlyName: 'Static WADO Local Data',
        name: 'DCM4CHEE',
-        qidoRoot: 'http://128.199.154.150:5000/rs',
-        wadoRoot: 'http://128.199.154.150: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',
--- a/platform/app/public/config/google.js
+++ b/platform/app/public/config/google.js
@@ -1,6 +1,9 @@
 /** @type {AppTypes.Config} */
 window.config = {
  routerBasename: '/',
+  pacs_document_host: '152.42.173.210',
+  pacs_document_port: 8080,
+  expertise: false,
  enableGoogleCloudAdapter: false,
  // below flag is for performance reasons, but it might not work for all servers
  showWarningMessageForCrossOrigin: true,
@@ -8,37 +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,
@@ -51,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',
@@ -66,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'
+        // },
      },
    },
    {
--- a/platform/ui-next/src/components/SidePanel/SidePanel.tsx
+++ b/platform/ui-next/src/components/SidePanel/SidePanel.tsx
@@ -154,6 +154,7 @@ const SidePanel = ({
  expandedWidth = 280,
  onActiveTabIndexChange,
  servicesManager, // Tambah servicesManager as a prop
+  studyInstanceUID,
 }) => {
  const [panelOpen, setPanelOpen] = useState(activeTabIndexProp !== null);
  const [activeTabIndex, setActiveTabIndex] = useState(0);
@@ -166,8 +167,8 @@ const SidePanel = ({
  const [viewportData, setViewportData] = useState(null);

  // Harusnya (viewportId), tapi karena gabutuh perubahan viewport maka dihardcode 'default'
-  const viewportInfo = cornerstoneViewportService.getViewportInfo('default');
-  const studyInstanceUID = viewportInfo?.viewportData?.data?.[0]?.StudyInstanceUID || '';
+  // const viewportInfo = cornerstoneViewportService.getViewportInfo('default');
+  // const studyInstanceUID = viewportInfo?.viewportData?.data?.[0]?.StudyInstanceUID || '';

  const styleMap = createStyleMap(expandedWidth, borderSize, collapsedWidth);
  const baseStyle = createBaseStyle(expandedWidth);
@@ -359,46 +360,7 @@ const SidePanel = ({

      const response = await fetch(url);
      const data = await response.json();
-      // console.log('Study data:', data);
-
-      const data = {
-        study: {
-          accession_no: 'CR.250411.001',
-          study_iuid: '1.2.826.0.1.3680043.9.7307.1.20250411001',
-          study_description: '',
-          study_datetime: '20250411093937',
-          number_of_series: '1',
-          number_of_instances: '1',
-          modality: 'CR',
-          patient_mrn: '00000941',
-          patient_name: 'NEFANNY RIDWAN',
-          patient_sex: 'F',
-          patient_date_of_birth: '19881127',
-          patient_age: '36Y 4M 14D',
-          expertise: [
-            {
-              expertise:
-                'Keterangan : MCU\r\n\r\nRadiografi Thorax PA (inspirasi kurang)\r\n\r\nCor : besar dan bentuk normal\r\nPulmo : tak tampak infiltrat\r\nTrachea tampak di tengah\r\nSinus phrenicocostalis kanan kiri tajam\r\nHemidiafragma kanan kiri tampak baik\r\nTulang-tulang tampak baik\r\nSoft tissue tak tampak kelainan\r\n\r\nKesan :\r\nTidak tampak kelainan signifikan pada pemeriksaan saat ini\r\n\r\nBTK,',
-              radiologist: 'dr. Hendra Boy Situmorang, Sp.Rad ',
-              expertise_dttm: '2025-04-11 09:43',
-              radiologist_edit: null,
-              expertise_edit_dttm: '0000-00-00 00:00',
-              ordering_physician: 'dr. Laksmitasari Dewi',
-            },
-          ],
-          series: [
-            {
-              series_number: '1',
-              series_iuid: '1.2.156.112536.2.560.28134011043131122.1519098341436.1',
-              series_description: 'V04_0014',
-              number_of_instances: 1,
-              thumbnail:
-                'http://192.168.22.3/nv/wado_proxy_thumb.php?requestType=WADO&studyUID=1.2.826.0.1.3680043.9.7307.1.20250411001&seriesUID=1.2.156.112536.2.560.28134011043131122.1519098341436.1&objectUID=1.2.156.112536.2.560.28134011043131122.1519098341436.4&rows=123',
-              sop_iuids: ['1.2.156.112536.2.560.28134011043131122.1519098341436.4'],
-            },
-          ],
-        },
-      };
+      console.log('Study data:', data);

      if (data?.study?.expertise && data.study.expertise.length > 0) {
        setExpertiseData(data.study.expertise[0]);
@@ -479,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
@@ -490,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>
        ))}
@@ -662,6 +629,7 @@ SidePanel.propTypes = {
  onActiveTabIndexChange: PropTypes.func,
  expandedWidth: PropTypes.number,
  servicesManager: PropTypes.object.isRequired, // Tambah servicesManager prop
+  studyInstanceUID: PropTypes.string, // Tambahkan prop studyInstanceUID
 };

 export { SidePanel };
--- a/platform/ui-next/src/components/StudyBrowser/StudyBrowser.tsx
+++ b/platform/ui-next/src/components/StudyBrowser/StudyBrowser.tsx
@@ -63,6 +63,7 @@ const StudyBrowser = ({
              viewPreset={viewPreset}
              onThumbnailContextMenu={onThumbnailContextMenu}
              servicesManager={servicesManager} // Pass servicesManager ke Study Item
+              studyInstanceUid={studyInstanceUid}
            />
          </React.Fragment>
        );
--- a/platform/ui-next/src/components/StudyItem/StudyItem.tsx
+++ b/platform/ui-next/src/components/StudyItem/StudyItem.tsx
@@ -21,7 +21,10 @@ const StudyItem = ({
  viewPreset = 'thumbnails',
  onThumbnailContextMenu,
  servicesManager, // Tambah servicesManager as a prop
+  studyInstanceUid = '',
 }: withAppTypes) => {
+  // FETCHING ACCESSION NUMBER DAN EXPERTISE
+
  return (
    <Accordion
      type="single"
@@ -59,16 +62,17 @@ const StudyItem = ({
            <>
              {/* Expertise Button */}
              <div
-                className="bg-primary-dark hover:bg-primary-active my-4 w-full cursor-pointer border border-white py-2 text-center text-white"
+                className="bg-primary-dark hover:bg-primary-active mx-8 my-4 cursor-pointer rounded-lg border border-white py-3 text-center text-white"
                onClick={() => {
                  // Trigger the expertise panel in the right side panel (segmentation Panel)
                  servicesManager.services.panelService.activatePanel(
-                    '@ohif/extension-cornerstone.panelModule.panelSegmentation-exp',
+                    // '@ohif/extension-cornerstone.panelModule.panelSegmentation-exp',
+                    `@ohif/extension-cornerstone.panelModule.panelSegmentation-exp-${studyInstanceUid}`,
                    true
                  );
                }}
              >
-                View Expertise
+                Expertise
              </div>

              {/* Thumbnails */}
@@ -105,6 +109,7 @@ StudyItem.propTypes = {
  onClickUntrack: PropTypes.func,
  viewPreset: PropTypes.string,
  servicesManager: PropTypes.object.isRequired, // Tambah servicesManager prop
+  studyInstanceUid: PropTypes.string.string,
 };

 export { StudyItem };
Author	SHA1	Message	Date
mario	cf5cb2dfbf	adjust scroll area expertise \| deploy sudirman	2025-06-17 18:24:18 +07:00
mario	860a738734	ganti google.js ke proxy cloud-pacs	2025-05-02 16:27:56 +07:00
mario	f323b0b046	seversi dengan hangtuah	2025-04-30 08:10:22 +07:00
mario	ca84179aa6	fix: button expertise view tiap study	2025-04-15 03:11:46 +00:00
mario	841f84bfdb	expertise host, rounding button, dan issue view per study	2025-04-14 11:24:36 +07:00