Merge pull request #835 from IQSS/feat/361-link-collection-and-link-dataset

Link Collection & Link Dataset

Author: ofahimIQSS

CHANGELOG.md

@@ -11,6 +11,7 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 - Added the value entered by the user in the error messages for metadata field validation errors in EMAIL and URL type fields. For example, instead of showing “Point of Contact E-mail is not a valid email address.“, we now show “Point of Contact E-mail foo is not a valid email address.”
 - Contact Owner button in File Page.
 - Share button in File Page.
+- Link Collection and Link Dataset features.
 
 ### Changed
 

package-lock.json

@@ -18,7 +18,7 @@
     "@dnd-kit/sortable": "8.0.0",
     "@dnd-kit/utilities": "3.2.2",
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-alpha.76",
+    "@iqss/dataverse-client-javascript": "2.0.0-alpha.77",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",

package.json

@@ -28,6 +28,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
   - Fix word wrapping in options list to prevent overflow and ensure long text is displayed correctly.
 - **ButtonGroup:**
   - Fix styles for vertical button groups when using tooltips.
+- **FormText:** Add `className` prop to allow custom styling.
+- **FormInput:** Add `size` prop to allow different input sizes (e.g., 'sm', 'lg'). Defaults to standard size if not specified.
 
 # [2.0.2](https://github.com/IQSS/dataverse-frontend/compare/@iqss/[email protected]...@iqss/[email protected]) (2024-06-23)
 

packages/design-system/CHANGELOG.md

@@ -14,6 +14,7 @@ export interface FormInputProps extends Omit<React.InputHTMLAttributes<FormInput
   required?: boolean
   autoFocus?: boolean
   autoComplete?: string
+  size?: 'sm' | 'lg'
 }
 
 export const FormInput = React.forwardRef(function FormInput(
@@ -28,6 +29,7 @@ export const FormInput = React.forwardRef(function FormInput(
     required,
     autoFocus,
     autoComplete,
+    size,
     ...props
   }: FormInputProps,
   ref
@@ -45,6 +47,7 @@ export const FormInput = React.forwardRef(function FormInput(
       required={required}
       autoFocus={autoFocus}
       autoComplete={autoComplete}
+      size={size}
       ref={ref as React.ForwardedRef<HTMLInputElement>}
       {...props}
     />

packages/design-system/src/lib/components/form/form-group/form-element/FormInput.tsx

@@ -1,6 +1,10 @@
 import { ReactNode } from 'react'
 import { Form as FormBS } from 'react-bootstrap'
 
-export function FormText({ children }: { children: ReactNode }) {
-  return <FormBS.Text muted>{children}</FormBS.Text>
+export function FormText({ children, className }: { children: ReactNode; className?: string }) {
+  return (
+    <FormBS.Text muted className={className}>
+      {children}
+    </FormBS.Text>
+  )
 }

packages/design-system/src/lib/components/form/form-group/form-element/FormText.tsx

@@ -69,5 +69,11 @@
   },
   "collectionDeletedSuccess": "Your collection has been deleted.",
   "defaultCollectionDeleteError": "Something went wrong deleting the collection. Try again later.",
-  "description": "Description"
+  "description": "Description",
+  "linkCollection": {
+    "title": "Link Collection",
+    "helper": "Choose which of your collections you would like to link this collection to.",
+    "save": "Save Linked Collection",
+    "success": "<wrapper>{{linkedCollectionName}} has been successfully linked to <a>{{linkingCollectionName}}</a></wrapper>"
+  }
 }

public/locales/en/collection.json

@@ -36,7 +36,17 @@
       "removeCurrentStatus": "Remove Current Status"
     },
     "linkDataset": {
-      "title": "Link Dataset"
+      "title": "Link Dataset",
+      "helper": "Choose which of your collections you would like to link this dataset to.",
+      "linkedCollections": "Note: This dataset is already linked to the following collections:",
+      "save": "Link",
+      "success": "<wrapper>Dataset from {{parentCollection}} has been successfully linked to <a>{{linkingCollectionName}}</a></wrapper>"
+    },
+    "unlinkDataset": {
+      "title": "Unlink Dataset",
+      "helper": "Choose which of your collections you would like to unlink this dataset from.",
+      "save": "Unlink",
+      "success": "<wrapper>Dataset unlinked from <a>{{unlinkingCollectionName}}</a></wrapper>"
     },
     "editDataset": {
       "title": "Edit Dataset",

public/locales/en/dataset.json

@@ -27,6 +27,7 @@
   "dragHandleLabel": "press space to select and keys to drag",
   "unknown": "Unknown",
   "find": "Find",
+  "link": "Link",
   "allowPopups": "You must enable popups in your browser to open external tools in a new window or tab.",
   "externalToolOpeningFailed": "There was a problem opening the external tool. Please try again.",
   "exportMetadata": "Export Metadata",
@@ -304,6 +305,16 @@
     "truncateMoreTip": "Click to read the full {{contentName}}",
     "truncateLessTip": "Click to collapse the {{contentName}}"
   },
+  "collectionLinkSelect": {
+    "label": "Your Collection",
+    "select": "Select a Collection",
+    "placeholder": "Enter Collection Name",
+    "noOptions": "No collections found",
+    "onlyOneCollectionToLink": "You have one collection you can link this {{linkingObjectType}} to.",
+    "onlyOneCollectionToUnlink": "You have one collection you can unlink this {{linkingObjectType}} from.",
+    "noCollectionsToLink": "No collections are showing up to link. They may already be linked, or you might not have any yet. Create a new collection to continue.",
+    "noCollectionsToUnlink": "No collections are showing up to unlink."
+  },
   "exploreOptions": "Explore Options",
   "queryOptions": "Query Options",
   "configureOptions": "Configure Options"

public/locales/en/shared.json

@@ -7,4 +7,5 @@
   --toastify-color-warning: #{$dv-warning-color};
   --toastify-color-error: #{$dv-danger-color};
   --toastify-font-family: #{$dv-font-family};
+  --toastify-toast-padding: 14px 28px 14px 14px;
 }