ui-soxo-bootstrap-core 2.6.49 → 2.6.50-dev.0

package/core/modules/reporting/components/reporting-dashboard/display-columns/display-cell-renderer.js

@@ -90,41 +90,6 @@ export function getRedirectLink(entry = {}, record = {}, CustomComponents = {})
   return redirectLink;
 }
 
-/**
- * Resolves the PDF/file location for file-based action entries.
- *
- * Supports either:
- * - `entry.file_location` as a direct URL/path
- * - `entry.file_location` as a record field name
- *
- * @param {DisplayColumnEntry} entry
- * @param {DisplayRecord} record
- * @returns {string}
- */
-export function getFileLocation(entry = {}, record = {}) {
-  if (entry.file_location && typeof entry.file_location === 'string' && record[entry.file_location]) {
-    return record[entry.file_location];
-  }
-
-  return record.file_location || entry.file_location || '';
-}
-
-/**
- * Resolves a value from the row when a config field points to a record key,
- * otherwise returns the provided literal value.
- *
- * @param {*} value
- * @param {DisplayRecord} record
- * @returns {*}
- */
-function resolveRecordValue(value, record = {}) {
-  if (typeof value === 'string' && Object.prototype.hasOwnProperty.call(record, value)) {
-    return record[value];
-  }
-
-  return value;
-}
-
 /**
  * Resolves action label text with backward-compatible precedence.
  *
@@ -219,26 +184,17 @@ function renderCustomComponent({ entry, record, CustomComponents, refresh }) {
  */
 function FileActionLink({ entry, record, CustomComponents }) {
   const [isPdfVisible, setIsPdfVisible] = useState(false);
-  const fileUrl = getFileLocation(entry, record);
   const actionLabel = getActionLabel(entry, record);
   const FileLoaderComponent = CustomComponents?.FileLoader;
 
-  if (!fileUrl) {
-    return null;
-  }
+
 
   const fileLoaderProps = {
-    url: fileUrl,
-    type: resolveRecordValue(entry.file_type, record) || 'pdf',
-    defaultScale: resolveRecordValue(entry.default_scale, record),
-    viewerType: resolveRecordValue(entry.viewer_type, record),
+    url: record?.file_location + record?.file_name,
     config: {
-      requireLinuxPath: resolveRecordValue(entry.require_linux_path, record),
-      replaceBranch: resolveRecordValue(entry.replace_branch, record),
       ...(entry.file_loader_config || {}),
     },
-    entry,
-    record,
+    type:record?.Native_filetype,
   };
 
   return (

package/core/modules/reporting/components/reporting-dashboard/display-columns/display-cell-renderer.test.js

@@ -3,7 +3,6 @@ import {
   isLegacyActionEntry,
   isActionTypeEntry,
   getRedirectLink,
-  getFileLocation,
   getActionLabel,
   renderDisplayCell,
 } from './display-cell-renderer';
@@ -29,13 +28,6 @@ describe('display-cell-renderer', () => {
     expect(link).toBe('/bill/10/visit/OP100');
   });
 
-  test('resolves file location from direct config value or record field', () => {
-    expect(getFileLocation({ file_location: 'https://example.com/report.pdf' }, {})).toBe('https://example.com/report.pdf');
-    expect(getFileLocation({ file_location: 'document_url' }, { document_url: 'https://example.com/record.pdf' })).toBe(
-      'https://example.com/record.pdf',
-    );
-  });
-
   test('keeps legacy action label behavior unchanged', () => {
     const entry = {
       field: 'action',
@@ -111,24 +103,15 @@ describe('display-cell-renderer', () => {
         type: 'action',
         field: 'action_text',
         redirect_link_type: 'file',
-        file_location: 'document_path',
-        file_type: 'document_type',
-        default_scale: 'zoom_level',
-        viewer_type: 'inline_viewer',
-        require_linux_path: 'needs_linux_path',
-        replace_branch: 'should_replace_branch',
         file_loader_config: {
           sample: true,
         },
       },
       record: {
         action_text: 'Preview',
-        document_path: '\\\\server\\reports\\doc.pdf',
-        document_type: 'pdf',
-        zoom_level: 1.25,
-        inline_viewer: true,
-        needs_linux_path: true,
-        should_replace_branch: false,
+        file_location: '\\\\server\\reports\\',
+        file_name: 'doc.pdf',
+        Native_filetype: 'pdf',
       },
       refresh: jest.fn(),
       CustomComponents: { FileUpload },
@@ -140,14 +123,11 @@ describe('display-cell-renderer', () => {
     expect(modalContent.type).toBe(FileUpload);
     expect(modalContent.props.url).toBe('\\\\server\\reports\\doc.pdf');
     expect(modalContent.props.type).toBe('pdf');
-    expect(modalContent.props.defaultScale).toBe(1.25);
-    expect(modalContent.props.viewerType).toBe(true);
     expect(modalContent.props.config).toEqual({
       requireLinuxPath: true,
       replaceBranch: false,
       sample: true,
     });
-    expect(modalContent.props.record.document_path).toBe('\\\\server\\reports\\doc.pdf');
   });
 
   test('renders styled tag/span/icon/text for non-action path', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.49",
+  "version": "2.6.50-dev.0",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"