@aehrc/smart-forms-renderer 0.13.2 → 0.15.0

package/lib/utils/validateQuestionnaire.d.ts

@@ -1,7 +1,6 @@
-import type { QuestionnaireResponse } from 'fhir/r4';
-import { Questionnaire } from 'fhir/r4';
-import { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
-import { RegexValidation } from '../interfaces/regex.interface';
+import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
+import type { RegexValidation } from '../interfaces/regex.interface';
 export type InvalidType = 'regex' | 'minLength' | 'maxLength' | 'required';
 interface ValidateQuestionnaireParams {
     questionnaire: Questionnaire;
@@ -14,7 +13,6 @@ interface ValidateQuestionnaireParams {
 /**
  * Recursively go through the questionnaireResponse and check for un-filled required qItems
  * At the moment item.required for group items are not checked
- * FIXME will eventually be renamed to validate questionnaire
  *
  * @author Sean Fong
  */

package/lib/utils/validateQuestionnaire.js

@@ -21,7 +21,6 @@ import { structuredDataCapture } from 'fhir-sdc-helpers';
 /**
  * Recursively go through the questionnaireResponse and check for un-filled required qItems
  * At the moment item.required for group items are not checked
- * FIXME will eventually be renamed to validate questionnaire
  *
  * @author Sean Fong
  */
@@ -72,7 +71,7 @@ function validateItemRecursive(params) {
     }
     // FIXME repeat groups not working
     if (qItem.type === 'group' && qItem.repeats) {
-        return validateRepeatGroup(qItem, qrItem, invalidItems);
+        return;
     }
     const childQItems = qItem.item;
     if (childQItems && childQItems.length > 0) {
@@ -148,9 +147,13 @@ function validateSingleItem(qItem, qrItem, invalidItems) {
     }
     return invalidItems;
 }
-function validateRepeatGroup(qItem, qrItems, invalidLinkIds) {
-    return;
-}
+// function validateRepeatGroup(
+//   qItem: QuestionnaireItem,
+//   qrItems: QuestionnaireResponseItem,
+//   invalidLinkIds: Record<string, InvalidType>
+// ) {
+//   return;
+// }
 function getInputInString(answer) {
     if (answer.valueString) {
         return answer.valueString;

package/lib/utils/validateQuestionnaire.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateQuestionnaire.js","sourceRoot":"","sources":["../../src/utils/validateQuestionnaire.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateQuestionnaire.js","sourceRoot":"","sources":["../../src/utils/validateQuestionnaire.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.13.2",
+  "version": "0.15.0",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {
@@ -35,6 +35,8 @@
     "lodash.debounce": "^4.0.8",
     "nanoid": "^5.0.1",
     "react-beautiful-dnd": "^13.1.1",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
     "react-markdown": "^8.0.7",
     "zustand": "^4.4.6"
   },

package/src/components/FormComponents/AttachmentItem/AttachmentField.tsx

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
+import { StandardTextField } from '../Textfield.styles';
+import AttachmentFileCollector from './AttachmentFileCollector';
+import Typography from '@mui/material/Typography';
+import Box from '@mui/material/Box';
+import Stack from '@mui/material/Stack';
+import type { AttachmentValues } from './AttachmentItem';
+import AttachmentUrlField from './AttachmentUrlField';
+
+interface AttachmentFieldProps extends PropsWithIsTabledAttribute {
+  linkId: string;
+  attachmentValues: AttachmentValues;
+  readOnly: boolean;
+  onUploadFile: (file: File | null) => void;
+  onUrlChange: (url: string) => void;
+  onFileNameChange: (fileName: string) => void;
+}
+
+function AttachmentField(props: AttachmentFieldProps) {
+  const {
+    linkId,
+    attachmentValues,
+    readOnly,
+    isTabled,
+    onUploadFile,
+    onUrlChange,
+    onFileNameChange
+  } = props;
+
+  const { uploadedFile, url, fileName } = attachmentValues;
+
+  return (
+    <>
+      <Stack rowGap={1}>
+        <Typography variant="subtitle2">
+          An attachment must either have a file or a URL, or both.
+        </Typography>
+        <Box>
+          <AttachmentFileCollector
+            uploadedFile={uploadedFile}
+            isTabled={isTabled}
+            onUploadFile={onUploadFile}
+          />
+        </Box>
+
+        <AttachmentUrlField
+          linkId={linkId}
+          url={url}
+          readOnly={readOnly}
+          isTabled={isTabled}
+          onUrlChange={onUrlChange}
+        />
+
+        <Box>
+          <Typography variant="body2">File name (optional)</Typography>
+          <StandardTextField
+            fullWidth
+            isTabled={isTabled}
+            id={linkId}
+            value={fileName}
+            onChange={(event) => onFileNameChange(event.target.value)}
+            disabled={readOnly}
+            size="small"
+            data-test="q-item-attachment-field"
+          />
+        </Box>
+
+        {uploadedFile && url ? (
+          <Typography variant="subtitle2">
+            Ensure that the attached file and URL has the same content.
+          </Typography>
+        ) : null}
+      </Stack>
+    </>
+  );
+}
+
+export default AttachmentField;

package/src/components/FormComponents/AttachmentItem/AttachmentFieldWrapper.tsx

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// import { HTML5Backend } from 'react-dnd-html5-backend';
+//
+// <DndProvider backend={HTML5Backend}>
+
+import React from 'react';
+import AttachmentField from './AttachmentField';
+import { FullWidthFormComponentBox } from '../../Box.styles';
+import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
+import type {
+  PropsWithIsRepeatedAttribute,
+  PropsWithIsTabledAttribute
+} from '../../../interfaces/renderProps.interface';
+import type { QuestionnaireItem } from 'fhir/r4';
+import type { AttachmentValues } from './AttachmentItem';
+
+interface AttachmentFieldWrapperProps
+  extends PropsWithIsRepeatedAttribute,
+    PropsWithIsTabledAttribute {
+  qItem: QuestionnaireItem;
+  attachmentValues: AttachmentValues;
+  readOnly: boolean;
+  onUploadFile: (file: File | null) => void;
+  onUrlChange: (url: string) => void;
+  onFileNameChange: (fileName: string) => void;
+}
+
+function AttachmentFieldWrapper(props: AttachmentFieldWrapperProps) {
+  const {
+    qItem,
+    attachmentValues,
+    readOnly,
+    isRepeated,
+    isTabled,
+    onUploadFile,
+    onUrlChange,
+    onFileNameChange
+  } = props;
+
+  if (isRepeated) {
+    return (
+      <AttachmentField
+        linkId={qItem.linkId}
+        attachmentValues={attachmentValues}
+        readOnly={readOnly}
+        isTabled={isTabled}
+        onUploadFile={onUploadFile}
+        onUrlChange={onUrlChange}
+        onFileNameChange={onFileNameChange}
+      />
+    );
+  }
+
+  return (
+    <FullWidthFormComponentBox data-test="q-item-attachment-box">
+      <ItemFieldGrid qItem={qItem} readOnly={readOnly}>
+        <AttachmentField
+          linkId={qItem.linkId}
+          attachmentValues={attachmentValues}
+          readOnly={readOnly}
+          isTabled={isTabled}
+          onUploadFile={onUploadFile}
+          onUrlChange={onUrlChange}
+          onFileNameChange={onFileNameChange}
+        />
+      </ItemFieldGrid>
+    </FullWidthFormComponentBox>
+  );
+}
+
+export default AttachmentFieldWrapper;

package/src/components/FormComponents/AttachmentItem/AttachmentFileCollector.tsx

@@ -0,0 +1,101 @@
+/*
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ChangeEvent } from 'react';
+import React, { memo, useCallback } from 'react';
+import { Box, IconButton, Stack, Tooltip } from '@mui/material';
+import { useSnackbar } from 'notistack';
+import AttachmentFileDropBox from './AttachmentFileDropBox';
+import Iconify from '../../Iconify/Iconify';
+import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
+
+interface AttachmentFileCollectorProps extends PropsWithIsTabledAttribute {
+  uploadedFile: File | null;
+  onUploadFile: (file: File | null) => void;
+}
+
+const AttachmentFileCollector = memo(function AttachmentFileCollector(
+  props: AttachmentFileCollectorProps
+) {
+  const { uploadedFile, isTabled, onUploadFile } = props;
+
+  const { enqueueSnackbar } = useSnackbar();
+
+  const handleFileDrop = useCallback(
+    (item: { files: any[] }) => {
+      if (item) {
+        const files = item.files;
+
+        if (files.length > 1) {
+          enqueueSnackbar('Only one file allowed', {
+            variant: 'warning',
+            preventDuplicate: true
+          });
+        }
+
+        if (files[0] instanceof File) {
+          const file = files[0];
+
+          onUploadFile(file);
+        }
+      }
+    },
+    [onUploadFile, enqueueSnackbar]
+  );
+
+  function handleAttachFile(event: ChangeEvent<HTMLInputElement>) {
+    const file = event.target.files?.[0];
+
+    if (file instanceof File) {
+      onUploadFile(file);
+    }
+  }
+
+  return (
+    <>
+      <AttachmentFileDropBox
+        onDrop={handleFileDrop}
+        file={uploadedFile}
+        errorMessage={''}
+        isTabled={isTabled}
+      />
+      <Stack direction="row" justifyContent="space-between" pt={0.5}>
+        <Box>
+          <Tooltip title="Attach file">
+            <IconButton component="label" size="small">
+              <Iconify icon="fluent:attach-24-regular" />
+              <input type="file" hidden onChange={handleAttachFile} />
+            </IconButton>
+          </Tooltip>
+          <Tooltip title="Remove file">
+            <span>
+              <IconButton
+                disabled={!uploadedFile}
+                color="error"
+                size="small"
+                onClick={() => onUploadFile(null)}>
+                <Iconify icon="ant-design:delete" />
+              </IconButton>
+            </span>
+          </Tooltip>
+        </Box>
+      </Stack>
+    </>
+  );
+});
+
+export default AttachmentFileCollector;

package/src/components/FormComponents/AttachmentItem/AttachmentFileDropBox.styles.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { styled } from '@mui/material/styles';
+import { Box } from '@mui/material';
+import { TEXT_FIELD_WIDTH } from '../Textfield.styles';
+
+export const AttachmentFileDropBoxWrapper = styled(Box, {
+  shouldForwardProp: (prop) => prop !== 'isActive' && prop !== 'isTabled'
+})<{ isActive: boolean; isTabled: boolean }>(({ theme, isActive, isTabled }) => ({
+  backgroundColor: theme.palette.background.paper,
+  border: '2px dashed',
+  borderColor: isActive ? theme.palette.secondary.main : theme.palette.primary.main,
+  borderRadius: '4px',
+  maxWidth: !isTabled ? TEXT_FIELD_WIDTH : 3000,
+  minWidth: 160
+}));

package/src/components/FormComponents/AttachmentItem/AttachmentFileDropBox.tsx

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Box, Typography } from '@mui/material';
+import useFileDrop from '../../../hooks/UseFileDrop';
+import { AttachmentFileDropBoxWrapper } from './AttachmentFileDropBox.styles';
+import React from 'react';
+import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
+import { getFileSize } from '../../../utils/fileUtils';
+
+export interface AttachmentFileDropBoxProps extends PropsWithIsTabledAttribute {
+  file: File | null;
+  onDrop: (item: { files: any[] }) => void;
+  errorMessage: string;
+}
+
+function AttachmentFileDropBox(props: AttachmentFileDropBoxProps) {
+  const { file, onDrop, errorMessage, isTabled } = props;
+
+  const { canDrop, isOver, dropTarget } = useFileDrop(onDrop);
+
+  const isActive = canDrop && isOver;
+
+  let boxMessage = 'No file selected';
+  if (isActive) {
+    boxMessage = 'Release to drop file';
+  } else if (errorMessage) {
+    boxMessage = errorMessage;
+  } else if (file) {
+    boxMessage = file.name;
+  }
+
+  return (
+    <AttachmentFileDropBoxWrapper
+      ref={dropTarget}
+      display="flex"
+      isActive={isActive}
+      isTabled={isTabled}>
+      <Box p={1.5}>
+        <Typography>{boxMessage}</Typography>
+        {file ? (
+          <Box pt={1}>
+            <Typography fontSize={10}>Size: {getFileSize(file.size.toString() ?? '0')}</Typography>
+            <Typography fontSize={10}>Type: {file.type}</Typography>
+          </Box>
+        ) : null}
+      </Box>
+    </AttachmentFileDropBoxWrapper>
+  );
+}
+
+export default AttachmentFileDropBox;

package/src/components/FormComponents/AttachmentItem/AttachmentItem.tsx

@@ -0,0 +1,123 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { useCallback, useState } from 'react';
+import type {
+  PropsWithIsRepeatedAttribute,
+  PropsWithIsTabledAttribute,
+  PropsWithParentIsReadOnlyAttribute,
+  PropsWithQrItemChangeHandler
+} from '../../../interfaces/renderProps.interface';
+import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
+import debounce from 'lodash.debounce';
+import { createEmptyQrItem } from '../../../utils/qrItem';
+import { DEBOUNCE_DURATION } from '../../../utils/debounce';
+import useStringInput from '../../../hooks/useStringInput';
+import useReadOnly from '../../../hooks/useReadOnly';
+import AttachmentFieldWrapper from './AttachmentFieldWrapper';
+import { HTML5Backend } from 'react-dnd-html5-backend';
+import { DndProvider } from 'react-dnd';
+import { createAttachmentAnswer } from '../../../utils/fileUtils';
+
+export interface AttachmentValues {
+  uploadedFile: File | null;
+  url: string;
+  fileName: string;
+}
+
+interface AttachmentItemProps
+  extends PropsWithQrItemChangeHandler,
+    PropsWithIsRepeatedAttribute,
+    PropsWithIsTabledAttribute,
+    PropsWithParentIsReadOnlyAttribute {
+  qItem: QuestionnaireItem;
+  qrItem: QuestionnaireResponseItem | null;
+}
+
+function AttachmentItem(props: AttachmentItemProps) {
+  const { qItem, qrItem, isRepeated, isTabled, parentIsReadOnly, onQrItemChange } = props;
+
+  const readOnly = useReadOnly(qItem, parentIsReadOnly);
+
+  // Init input value
+  let valueString = '';
+  if (qrItem?.answer && qrItem?.answer[0].valueString) {
+    valueString = qrItem.answer[0].valueString;
+  }
+  const [uploadedFile, setUploadedFile] = useState<File | null>(null);
+  const [url, setUrl] = useStringInput(valueString);
+  const [fileName, setFileName] = useStringInput(valueString);
+
+  // Event handlers
+  async function handleUploadFile(newUploadedFile: File | null) {
+    setUploadedFile(newUploadedFile);
+
+    const attachment = await createAttachmentAnswer(newUploadedFile, url, fileName);
+    if (attachment) {
+      onQrItemChange({
+        ...createEmptyQrItem(qItem),
+        answer: [{ valueAttachment: attachment }]
+      });
+    } else {
+      onQrItemChange(createEmptyQrItem(qItem));
+    }
+  }
+
+  async function handleUrlChange(newUrl: string) {
+    setUrl(newUrl);
+    await updateQrItemWithDebounce(uploadedFile, newUrl, fileName);
+  }
+
+  async function handleFileNameChange(newFileName: string) {
+    setFileName(newFileName);
+    await updateQrItemWithDebounce(uploadedFile, url, newFileName);
+  }
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const updateQrItemWithDebounce = useCallback(
+    debounce(async (file: File | null, url: string, fileName: string) => {
+      const attachment = await createAttachmentAnswer(file, url, fileName);
+
+      if (attachment) {
+        onQrItemChange({
+          ...createEmptyQrItem(qItem),
+          answer: [{ valueAttachment: attachment }]
+        });
+      } else {
+        onQrItemChange(createEmptyQrItem(qItem));
+      }
+    }, DEBOUNCE_DURATION),
+    [onQrItemChange, qItem]
+  ); // Dependencies are tested, debounce is causing eslint to not recognise dependencies
+
+  return (
+    <DndProvider backend={HTML5Backend} context={window}>
+      <AttachmentFieldWrapper
+        qItem={qItem}
+        attachmentValues={{ uploadedFile: uploadedFile, url: url, fileName: fileName }}
+        readOnly={readOnly}
+        isRepeated={isRepeated}
+        isTabled={isTabled}
+        onUploadFile={handleUploadFile}
+        onUrlChange={handleUrlChange}
+        onFileNameChange={handleFileNameChange}
+      />
+    </DndProvider>
+  );
+}
+
+export default AttachmentItem;

package/src/components/FormComponents/AttachmentItem/AttachmentUrlField.tsx

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
+import { StandardTextField } from '../Textfield.styles';
+import Typography from '@mui/material/Typography';
+import Box from '@mui/material/Box';
+import Stack from '@mui/material/Stack';
+import useAttachmentUrlValidation from '../../../hooks/useAttachmentUrlValidation';
+import InputAdornment from '@mui/material/InputAdornment';
+import Tooltip from '@mui/material/Tooltip';
+import CheckIcon from '@mui/icons-material/Check';
+import DangerousIcon from '@mui/icons-material/Dangerous';
+
+interface AttachmentUrlFieldProps extends PropsWithIsTabledAttribute {
+  linkId: string;
+  url: string;
+  readOnly: boolean;
+  onUrlChange: (url: string) => void;
+}
+
+function AttachmentUrlField(props: AttachmentUrlFieldProps) {
+  const { linkId, url, readOnly, isTabled, onUrlChange } = props;
+
+  const urlIsValid = useAttachmentUrlValidation(url);
+
+  return (
+    <Box>
+      <Typography variant="body2">URL</Typography>
+      <Stack direction="row" alignItems="center">
+        <StandardTextField
+          fullWidth
+          isTabled={isTabled}
+          id={linkId}
+          value={url}
+          onChange={(event) => onUrlChange(event.target.value)}
+          disabled={readOnly}
+          size="small"
+          data-test="q-item-attachment-field"
+          InputProps={{
+            endAdornment: (
+              <InputAdornment position="end">
+                {url != '' ? (
+                  <Tooltip title={urlIsValid ? 'URL is valid!' : 'Invalid URL'} placement="right">
+                    <Box mt={0.5}>
+                      {urlIsValid ? (
+                        <CheckIcon color="success" fontSize="small" />
+                      ) : (
+                        <DangerousIcon color="error" fontSize="small" />
+                      )}
+                    </Box>
+                  </Tooltip>
+                ) : null}
+              </InputAdornment>
+            )
+          }}
+        />
+      </Stack>
+    </Box>
+  );
+}
+
+export default AttachmentUrlField;