@truedat/dd 7.12.2 → 7.12.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.12.2",
+  "version": "7.12.4",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,7 +48,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.12.2",
+    "@truedat/test": "7.12.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -83,5 +83,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "b5edde19955e90a0e17d4e8bdaf2c1fe871bc3b9"
+  "gitHead": "6e0e12074f41a48b5ff7a03e43ca41b3cda59b2d"
 }

package/src/components/StructureNotesDownloadButton.js

@@ -2,23 +2,25 @@ import { useState } from "react";
 import PropTypes from "prop-types";
 import { Button, Checkbox, Modal, Icon } from "semantic-ui-react";
 import { useIntl } from "react-intl";
-import { useStructureNotesDownload } from "../hooks/useStructures";
+import { STRUCTURE } from "@truedat/core/routes";
+import { useDataStructureDownload } from "../hooks/useStructures";
 
 export const StructureNotesDownloadButton = ({ structureId }) => {
   const { formatMessage, locale } = useIntl();
   const [open, setOpen] = useState(false);
-  const [selectedStatuses, setSelectedStatuses] = useState(["published"]);
   const [includeChildren, setIncludeChildren] = useState(false);
 
   const { trigger: triggerDownload, isMutating: isDownloading } =
-    useStructureNotesDownload();
+    useDataStructureDownload();
  
   const handleDownload = () => {
     triggerDownload({
-      id: structureId,
-      statuses: selectedStatuses,
+      data_structure_id: structureId,
       include_children: includeChildren,
-      lang: locale
+      lang: locale,
+      structure_url_schema: window.location.origin + STRUCTURE,
+      download_type: "editable",
+      note_type: "published",
     });
     setOpen(false);
   };

package/src/components/__tests__/StructureNotesDownloadButton.spec.js

@@ -2,7 +2,12 @@ import React from "react";
 import { render, screen, fireEvent, waitFor } from "@testing-library/react";
 import { IntlProvider } from "react-intl";
 import { StructureNotesDownloadButton } from "../StructureNotesDownloadButton";
-import * as useStructures from "../../hooks/useStructures";
+import { useDataStructureDownload } from "../../hooks/useStructures";
+
+// Mock del hook
+jest.mock("../../hooks/useStructures", () => ({
+  useDataStructureDownload: jest.fn(),
+}));
 
 const messages = {
   "structure.actions.downloadNotes": "Download notes",
@@ -20,20 +25,14 @@ const renderWithIntl = (component) => {
   );
 };
 
-// Helper function to get checkbox by label text
-const getCheckboxByLabel = (labelText) => {
-  const label = screen.getByText(labelText);
-  const checkboxContainer = label.closest(".ui.checkbox");
-  return checkboxContainer.querySelector("input[type='checkbox']");
-};
-
 describe("StructureNotesDownloadButton", () => {
   const mockTrigger = jest.fn();
   const mockStructureId = "123";
 
   beforeEach(() => {
     jest.clearAllMocks();
-    jest.spyOn(useStructures, "useStructureNotesDownload").mockReturnValue({
+    // Mock el hook correcto
+    useDataStructureDownload.mockReturnValue({
       trigger: mockTrigger,
       isMutating: false,
     });
@@ -76,8 +75,11 @@ describe("StructureNotesDownloadButton", () => {
     const button = screen.getByRole("button");
     fireEvent.click(button);
 
-    const includeChildrenCheckbox = screen.getByText("Include direct children notes");
-    expect(includeChildrenCheckbox).toBeInTheDocument();
+    const includeChildrenLabel = screen.getByText("Include direct children notes");
+    expect(includeChildrenLabel).toBeInTheDocument();
+    
+    const checkbox = screen.getByRole("checkbox");
+    expect(checkbox).toBeInTheDocument();
   });
 
   it("allows toggling include children checkbox", () => {
@@ -90,16 +92,15 @@ describe("StructureNotesDownloadButton", () => {
     const button = screen.getByRole("button");
     fireEvent.click(button);
 
-    const includeChildrenCheckbox = getCheckboxByLabel("Include direct children notes");
+    const checkbox = screen.getByRole("checkbox");
     
-    // Initially should not be checked
-    expect(includeChildrenCheckbox).not.toBeChecked();
+    expect(checkbox).not.toBeChecked();
 
-    fireEvent.click(includeChildrenCheckbox);
-    expect(includeChildrenCheckbox).toBeChecked();
+    fireEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
 
-    fireEvent.click(includeChildrenCheckbox);
-    expect(includeChildrenCheckbox).not.toBeChecked();
+    fireEvent.click(checkbox);
+    expect(checkbox).not.toBeChecked();
   });
 
   it("calls trigger with correct parameters when download button is clicked", async () => {
@@ -112,20 +113,21 @@ describe("StructureNotesDownloadButton", () => {
     const openButton = screen.getByRole("button");
     fireEvent.click(openButton);
 
-    // Toggle the "Include direct children notes" checkbox to checked
-    const includeChildrenCheckbox = getCheckboxByLabel("Include direct children notes");
-    fireEvent.click(includeChildrenCheckbox);
-    expect(includeChildrenCheckbox).toBeChecked();
+    const checkbox = screen.getByRole("checkbox");
+    fireEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
 
-    const downloadButton = screen.getByRole("button", { name: /^download$/i });
+    const downloadButton = screen.getByRole("button", { name: /download/i });
     fireEvent.click(downloadButton);
 
     await waitFor(() => {
       expect(mockTrigger).toHaveBeenCalledWith({
-        id: mockStructureId,
+        data_structure_id: mockStructureId,
         include_children: true,
         lang: "en",
-        statuses: ["published"]
+        structure_url_schema: expect.stringContaining("http"),
+        download_type: "editable",
+        note_type: "published"
       });
     });
   });
@@ -140,19 +142,20 @@ describe("StructureNotesDownloadButton", () => {
     const openButton = screen.getByRole("button");
     fireEvent.click(openButton);
 
-    // Ensure "Include direct children notes" checkbox is not checked
-    const includeChildrenCheckbox = getCheckboxByLabel("Include direct children notes");
-    expect(includeChildrenCheckbox).not.toBeChecked();
+    const checkbox = screen.getByRole("checkbox");
+    expect(checkbox).not.toBeChecked();
 
-    const downloadButton = screen.getByRole("button", { name: /^download$/i });
+    const downloadButton = screen.getByRole("button", { name: /download/i });
     fireEvent.click(downloadButton);
 
     await waitFor(() => {
       expect(mockTrigger).toHaveBeenCalledWith({
-        id: mockStructureId,
+        data_structure_id: mockStructureId,
         include_children: false,
         lang: "en",
-        statuses: ["published"]
+        structure_url_schema: expect.stringContaining("http"),
+        download_type: "editable",
+        note_type: "published"
       });
     });
   });
@@ -170,7 +173,7 @@ describe("StructureNotesDownloadButton", () => {
     const modalTitle = screen.getByText("Download Structure Notes");
     expect(modalTitle).toBeInTheDocument();
 
-    const downloadButton = screen.getByRole("button", { name: /^download$/i });
+    const downloadButton = screen.getByRole("button", { name: /download/i });
     fireEvent.click(downloadButton);
 
     await waitFor(() => {
@@ -181,7 +184,7 @@ describe("StructureNotesDownloadButton", () => {
   });
 
   it("shows loading state when downloading", () => {
-    jest.spyOn(useStructures, "useStructureNotesDownload").mockReturnValue({
+    useDataStructureDownload.mockReturnValue({
       trigger: mockTrigger,
       isMutating: true,
     });
@@ -216,4 +219,42 @@ describe("StructureNotesDownloadButton", () => {
       screen.queryByText("Download Structure Notes")
     ).not.toBeInTheDocument();
   });
+
+  it("handles window location origin correctly", async () => {
+    // Guardar y mockear window.location
+    const originalLocation = window.location;
+    Object.defineProperty(window, 'location', {
+      value: { origin: 'http://localhost' },
+      writable: true
+    });
+
+    renderWithIntl(
+      <StructureNotesDownloadButton 
+        structureId={mockStructureId} 
+      />
+    );
+
+    const openButton = screen.getByRole("button");
+    fireEvent.click(openButton);
+
+    const downloadButton = screen.getByRole("button", { name: /download/i });
+    fireEvent.click(downloadButton);
+
+    await waitFor(() => {
+      expect(mockTrigger).toHaveBeenCalledWith({
+        data_structure_id: mockStructureId,
+        include_children: false,
+        lang: "en",
+        structure_url_schema: "http://localhost/structures/:id",
+        download_type: "editable",
+        note_type: "published"
+      });
+    });
+
+    // Restaurar window.location
+    Object.defineProperty(window, 'location', {
+      value: originalLocation,
+      writable: true
+    });
+  });
 });

package/src/hooks/useStructures.js

@@ -96,16 +96,4 @@ export const useDataStructureSuggestions = () => {
     return apiJsonPost(url, arg);
   });
 };
-
-export const useStructureNotesDownload = () => {
-  return useSWRMutations(API_STRUCTURE_NOTES_XLSX_DOWNLOAD, (url, { arg }) => {
-    const { id, ...params } = arg;
-    const downloadUrl = url.replace(":id", id);
-    return apiJsonPost(downloadUrl, params, {
-      ...JSON_OPTS,
-      responseType: "blob",
-    }).then(({ data, headers }) => {
-      saveFile({ data, headers });
-    });
-  });
-};
+