@rh-support/troubleshoot 2.6.303 → 2.6.304

package/lib/esm/components/CaseEditView/Case.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Case.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/Case.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,EAAS,mBAAmB,EAAiD,MAAM,kBAAkB,CAAC;AAoB7G,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,KAAK,EAAE,MAAM,qBA+PzC"}
+{"version":3,"file":"Case.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseEditView/Case.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,EAAS,mBAAmB,EAAiD,MAAM,kBAAkB,CAAC;AAmB7G,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,KAAK,EAAE,MAAM,qBA+PzC"}

package/lib/esm/components/CaseEditView/Case.js

@@ -20,10 +20,7 @@ import { Route, Switch, useLocation, useParams, useRouteMatch } from 'react-rout
 import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
 import { useCaseDetailsPageDispatchContext } from '../../context/CaseDetailsPageContext';
 import { CaseReducerConstants } from '../../reducers/CaseConstNTypes';
-import { 
-// TODO: Re-enable after GraphQL migration
-// fetchAttachments,
-fetchCaseEscalations,
+import { fetchAttachments, fetchCaseEscalations,
 // fetchExternalTrackers,
 // fetchFeedbacks,
  } from '../../reducers/CaseDetailsPageReducer';
@@ -58,11 +55,7 @@ export default function Case(props) {
     //     CaseDetailsFields.CASE_DETAILS_EXTERNAL_TRACKER
     // );
     // TODO: Re-enable after GraphQL migration of attachments
-    // const canSeeAttachments = ability.can(
-    //     resourceActions.PATCH,
-    //     resources.CASE_DETAILS,
-    //     CaseDetailsFields.CASE_DETAILS_SEE_ATTACHMENTS
-    // );
+    const canSeeAttachments = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_SEE_ATTACHMENTS);
     const canSeeRMEs = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_RMES);
     const { product, isFetchingCaseDetails, isFetchingCaseDetailsError, caseDetailsError, selectedAccountDetails } = useCaseSelector((state) => ({
         product: state.caseDetails.product,
@@ -132,14 +125,9 @@ export default function Case(props) {
                 if (canSeeRMEs && (caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.id)) {
                     fetchCaseEscalations((action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action), caseDetails.id, apolloClient);
                 }
-                // TODO: Re-enable after GraphQL migration of attachments
-                // if (canSeeAttachments) {
-                //     fetchAttachments(
-                //         (action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action),
-                //         targetCaseNumber,
-                //         loggedInUsersAccount.data.secureSupport!
-                //     );
-                // }
+                if (canSeeAttachments) {
+                    fetchAttachments((action) => currentCaseRef.current === targetCaseNumber && caseDetailsPageDispatch(action), targetCaseNumber, apolloClient, caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.id);
+                }
                 // TODO: Re-enable after GraphQL migration of external trackers
                 // if (canSeeExternalTracker) {
                 //     fetchExternalTrackers(

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/CaseAttachment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseAttachment.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseAttachment.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAexE,OAAO,KAAuC,MAAM,OAAO,CAAC;AAS5D,UAAU,MAAM;IACZ,UAAU,EAAE,WAAW,CAAC;IACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,WAAW,KAAK,IAAI,CAAC;IACzE,eAAe,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,kBAAkB,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAChH;AAED,QAAA,MAAM,cAAc,4EAqPlB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"CaseAttachment.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseAttachment.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAsBxE,OAAO,KAAuC,MAAM,OAAO,CAAC;AAS5D,UAAU,MAAM;IACZ,UAAU,EAAE,WAAW,CAAC;IACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,WAAW,KAAK,IAAI,CAAC;IACzE,eAAe,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,kBAAkB,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAChH;AAED,QAAA,MAAM,cAAc,4EA4RlB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/CaseAttachment.js

@@ -7,13 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { caseAttachments, kase } from '@cee-eng/hydrajs';
+import { useApolloClient } from '@apollo/client/react';
 import { Button, ButtonVariant, Icon, Tooltip, TooltipPosition } from '@patternfly/react-core';
 import PaperclipIcon from '@patternfly/react-icons/dist/js/icons/paperclip-icon';
 import { InlineEdit, LoadingIndicator, ToastNotification, useConfirmation, useCopyToClipboard, useFetch, } from '@rh-support/components';
-import { GlobalMetadataStateContext, useCanEditCase } from '@rh-support/react-context';
+// TODO: Re-enable when secure support download restrictions are needed again
+// import { GlobalMetadataStateContext, useCanEditCase } from '@rh-support/react-context';
+import { useCanEditCase } from '@rh-support/react-context';
 import { ability, CaseDiscussionFields, resourceActions, resources } from '@rh-support/user-permissions';
-import { formatDateTime, humanizeSize } from '@rh-support/utils';
+import { deleteCaseAttachment, formatDateTime, humanizeSize, updateCaseAttachmentDescriptionByGraphQL, } from '@rh-support/utils';
 import isEmpty from 'lodash/isEmpty';
 import React, { useContext, useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
@@ -27,18 +29,35 @@ const CaseAttachment = React.forwardRef((props, ref) => {
     const { t } = useTranslation();
     const clipboardRef = useRef(null);
     const { clipboardText, copyToClipboard } = useCopyToClipboard(clipboardRef);
-    const { request, isFetching: isDeleting } = useFetch(caseAttachments.deleteAttachment, { propgateErrors: true });
+    const { request, isFetching: isDeleting } = useFetch(deleteCaseAttachment, { propgateErrors: true });
     const canSeePrivateAttachments = ability.can(resourceActions.PATCH, resources.CASE_COMMENTS, CaseDiscussionFields.VIEW_PRIVATE_ATTACHMENT);
-    const { globalMetadataState: { loggedInUsersAccount }, } = useContext(GlobalMetadataStateContext);
+    // TODO: Re-enable when secure support download restrictions are needed again
+    // const {
+    //     globalMetadataState: { loggedInUsersAccount },
+    // } = useContext(GlobalMetadataStateContext);
     const [isCardIsDeleted, setIsCardIsDeleted] = useState(false); // adds a class name needed for anim when card is removed
     const { isExportingPDF } = useContext(PDFContext);
     const confirm = useConfirmation();
     const [attachmentDescription, setAttachmentDescription] = useState(props.attachment.description);
-    const { request: updateDescriptionRequest, isFetching: isUpdating } = useFetch(kase.updateAttachment);
+    const [isUpdating, setIsUpdating] = useState(false);
+    const apolloClient = useApolloClient();
     const canEditCase = useCanEditCase();
     const onDescriptionSave = () => __awaiter(void 0, void 0, void 0, function* () {
-        const updatedAttachment = yield updateDescriptionRequest(props.attachment.caseNumber, props.attachment.uuid, [{ path: 'description', op: 'update', value: attachmentDescription }], loggedInUsersAccount.data.secureSupport);
-        props.onMetadataUpdate && props.onMetadataUpdate(props.attachment.uuid, updatedAttachment);
+        if (!apolloClient.mutate) {
+            ToastNotification.addDangerMessage(t('Failed to update attachment description'));
+            return;
+        }
+        setIsUpdating(true);
+        try {
+            const updatedAttachment = yield updateCaseAttachmentDescriptionByGraphQL(apolloClient, props.attachment, attachmentDescription);
+            props.onMetadataUpdate && props.onMetadataUpdate(props.attachment.uuid, updatedAttachment);
+        }
+        catch (_a) {
+            ToastNotification.addDangerMessage(t('Failed to update attachment description'));
+        }
+        finally {
+            setIsUpdating(false);
+        }
     });
     const onDescriptionChange = (event) => {
         if (canEditCase.alert())
@@ -61,7 +80,9 @@ const CaseAttachment = React.forwardRef((props, ref) => {
                     "?")),
             });
             try {
-                yield request(attachment.caseNumber, attachment.uuid, loggedInUsersAccount.data.secureSupport);
+                // TODO: Re-enable when delete API accepts isSecureSupport again
+                // await request!(attachment.caseNumber!, attachment.uuid!, loggedInUsersAccount.data.secureSupport);
+                yield request(attachment.caseNumber, attachment.uuid);
                 ToastNotification.addSuccessMessage(t('Successfully deleted attachment: {{file}}', { file: attachment.fileName }));
                 setIsCardIsDeleted(true);
                 window.setTimeout(() => {
@@ -86,24 +107,51 @@ const CaseAttachment = React.forwardRef((props, ref) => {
         });
     };
     const renderAttachmentLink = () => {
-        if (!loggedInUsersAccount.data.secureSupport) {
-            if (isExportingPDF) {
-                return (React.createElement("a", { href: props.attachment.link },
-                    React.createElement("span", null,
-                        props.attachment.fileName,
-                        " (",
-                        humanizeSize(props.attachment.size),
-                        ")")));
-            }
-            return (React.createElement(Button, { className: "attachment-download-btn", title: t('Download {{fileName}}', { fileName: props.attachment.fileName }), variant: ButtonVariant.link, onClick: onAttachmentDownloadClick, "data-tracking-id": "attachment-download-button" },
+        // TODO: Re-enable secure support download gating when needed again
+        // if (!loggedInUsersAccount.data.secureSupport) {
+        //     if (isExportingPDF) {
+        //         return (
+        //             <a href={props.attachment.link}>
+        //                 <span>
+        //                     {props.attachment.fileName} ({humanizeSize(props.attachment.size)})
+        //                 </span>
+        //             </a>
+        //         );
+        //     }
+        //     return (
+        //         <Button
+        //             className="attachment-download-btn"
+        //             title={t('Download {{fileName}}', { fileName: props.attachment.fileName })}
+        //             variant={ButtonVariant.link}
+        //             onClick={onAttachmentDownloadClick}
+        //             data-tracking-id="attachment-download-button"
+        //         >
+        //             <span>
+        //                 {props.attachment.fileName} ({humanizeSize(props.attachment.size)})
+        //             </span>
+        //         </Button>
+        //     );
+        // }
+        // return (
+        //     <Tooltip
+        //         position={TooltipPosition.top}
+        //         content={t(`You don't have appropriate permissions to download the attachment`)}
+        //     >
+        //         <strong>
+        //             {props.attachment.fileName} ({humanizeSize(props.attachment.size)})
+        //         </strong>
+        //     </Tooltip>
+        // );
+        if (isExportingPDF) {
+            return (React.createElement("a", { href: props.attachment.link },
                 React.createElement("span", null,
                     props.attachment.fileName,
                     " (",
                     humanizeSize(props.attachment.size),
                     ")")));
         }
-        return (React.createElement(Tooltip, { position: TooltipPosition.top, content: t(`You don't have appropriate permissions to download the attachment`) },
-            React.createElement("strong", null,
+        return (React.createElement(Button, { className: "attachment-download-btn", title: t('Download {{fileName}}', { fileName: props.attachment.fileName }), variant: ButtonVariant.link, onClick: onAttachmentDownloadClick, "data-tracking-id": "attachment-download-button" },
+            React.createElement("span", null,
                 props.attachment.fileName,
                 " (",
                 humanizeSize(props.attachment.size),

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/CaseDiscussion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseDiscussion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseDiscussion.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAcvE,OAAO,KAAoE,MAAM,OAAO,CAAC;AAwCzF,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IAGxB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC/C,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;CAClD;AAOD,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,MAAM,qBAmhBnD"}
+{"version":3,"file":"CaseDiscussion.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/CaseDiscussion.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAkBvE,OAAO,KAAoE,MAAM,OAAO,CAAC;AAsCzF,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IAGxB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC/C,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;CAClD;AAOD,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,MAAM,qBA8hBnD"}

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/CaseDiscussion.js

@@ -7,13 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-// TODO: Re-enable after GraphQL migration of chats, external trackers, attachments
-// import { ICaseChat, IExternalTrackerUpdate } from '@cee-eng/hydrajs/@types/api/public/case';
-// import { IAttachment } from '@cee-eng/hydrajs/@types/models/attachment';
+import { useApolloClient } from '@apollo/client/react';
 import { MenuToggle, Select, SelectList, SelectOption } from '@patternfly/react-core';
-import { AlertMessage, AlertType, ErrorBoundary, LoadingIndicator } from '@rh-support/components';
+import { AlertMessage, AlertType, ErrorBoundary, LoadingIndicator, ToastNotification } from '@rh-support/components';
 import { useGlobalStateContext } from '@rh-support/react-context';
-import { dtmTrackEventCaseStepEncountered, getUrlParsedParams, scrollIntoView } from '@rh-support/utils';
+import { AbilityContext, CaseDetailsFields, resourceActions, resources } from '@rh-support/user-permissions';
+import { downloadCaseAttachment, dtmTrackEventCaseStepEncountered, getUrlParsedParams, scrollIntoView, } from '@rh-support/utils';
 import cloneDeep from 'lodash/cloneDeep';
 import filter from 'lodash/filter';
 import findIndex from 'lodash/findIndex';
@@ -25,22 +24,13 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 import { AutoSizer, CellMeasurer, CellMeasurerCache, List, WindowScroller } from 'react-virtualized';
 import { useCaseDispatch, useCaseSelector } from '../../../../context/CaseContext';
+import { useCaseDetailsPageDispatchContext, useCaseDetailsPageStateContext, } from '../../../../context/CaseDetailsPageContext';
 import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../../../context/CaseDiscussionTabContext';
-import { clearReplyComment, discussionSortOrderConst, DiscussionType, setCommentText, setDiscussions, setSort,
-// TODO: Re-enable after GraphQL migration
-// setFilter,
-// updateAttachment,
-// updateAttacmentsAfterRemoval,
-// updateCommentStateFeedback,
-// updateDiscussionStateAttachments,
- } from '../../../../reducers/CaseDiscussionTabReducer';
+import { clearReplyComment, discussionSortOrderConst, DiscussionType, setCommentText, setDiscussions, setSort, updateAttachment, updateAttacmentsAfterRemoval, updateDiscussionStateAttachments, } from '../../../../reducers/CaseDiscussionTabReducer';
 import { setCaseState } from '../../../../reducers/CaseReducer';
-// TODO: Re-enable after GraphQL migration of attachments
-// import { AttachmentContextProvider } from '../../../shared/fileUpload/reducer/AttachmentReducerContext';
+import { AttachmentContextProvider } from '../../../shared/fileUpload/reducer/AttachmentReducerContext';
 import { PDFContext } from '../../PDFContainer';
-// TODO: Re-enable after GraphQL migration
-// import CaseAttachment from './CaseAttachment';
-// import CaseChat from './CaseChat';
+import CaseAttachment from './CaseAttachment';
 import CaseComments from './CaseComments';
 // import CaseExternalTrackerUpdate from './CaseExternalTrackerUpdate';
 import { CommentSearch } from './CommentSearch';
@@ -53,18 +43,24 @@ let cellMeasureCache = new CellMeasurerCache({
 });
 export default function CaseDiscussion(props) {
     const { t } = useTranslation();
-    const { isPostingRemoteRequestCommentCompleted, product, version } = useCaseSelector((state) => ({
+    const { isPostingRemoteRequestCommentCompleted, product, version, caseSalesforceId } = useCaseSelector((state) => ({
         isPostingRemoteRequestCommentCompleted: state.isPostingRemoteRequestCommentCompleted,
         product: state.caseDetails.product,
         version: state.caseDetails.version,
+        caseSalesforceId: state.caseDetails.id,
     }), isEqual);
     const urlSearchParams = getUrlParsedParams(useLocation().search);
-    const discussionIdFromUrl = urlSearchParams === null || urlSearchParams === void 0 ? void 0 : urlSearchParams.commentId;
+    const discussionIdFromUrl = ((urlSearchParams === null || urlSearchParams === void 0 ? void 0 : urlSearchParams.commentId) || (urlSearchParams === null || urlSearchParams === void 0 ? void 0 : urlSearchParams.attachmentId));
     const activeDiscussionElementRef = useRef(null);
-    const { sort, allDiscussions, replyCommentText, replyCommentCreator } = useCaseDiscussionTabStateContext();
+    const { sort, discussionFiltersListState, allDiscussions, replyCommentText, replyCommentCreator } = useCaseDiscussionTabStateContext();
     const { globalMetadataState: { navBarRef }, } = useGlobalStateContext();
     const dispatchDiscussion = useCaseDiscussionTabDispatchContext();
+    const { caseDetailsPageState: { caseAttachmentHydra }, } = useCaseDetailsPageStateContext();
+    const dispatchCaseDetailsHydraAttachments = useCaseDetailsPageDispatchContext();
     const caseDispatch = useCaseDispatch();
+    const apolloClient = useApolloClient();
+    const ability = useContext(AbilityContext);
+    const canSeeAttachments = ability.can(resourceActions.PATCH, resources.CASE_DETAILS, CaseDetailsFields.CASE_DETAILS_SEE_ATTACHMENTS);
     const { caseNumber } = props;
     const activeElementId = useRef(null);
     const listRef = React.useRef(null);
@@ -134,14 +130,15 @@ export default function CaseDiscussion(props) {
     }, [discussionIdFromUrl, allDiscussions, activeElementId.current]);
     useEffect(() => {
         if (!isExportingPDF) {
-            setDiscussions(dispatchDiscussion, props.caseComments, [], // TODO: Re-enable chats after GraphQL migration
-            [], // TODO: Re-enable attachments after GraphQL migration
-            [], // TODO: Re-enable feedbacks after GraphQL migration
-            [], // TODO: Re-enable external trackers after GraphQL migration
-            [], false, false, false);
+            setDiscussions(dispatchDiscussion, props.caseComments, [], caseAttachmentHydra.data, [], [], discussionFiltersListState, false, false, canSeeAttachments);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.caseComments]);
+    }, [props.caseComments, caseAttachmentHydra, canSeeAttachments]);
+    useEffect(() => {
+        if (!caseAttachmentHydra.isFetching && caseAttachmentHydra.isError) {
+            ToastNotification.addDangerMessage(t('There was an error loading attachments.'));
+        }
+    }, [caseAttachmentHydra.isFetching, caseAttachmentHydra.isError, t]);
     const onCommentAdded = () => __awaiter(this, void 0, void 0, function* () {
         try {
             yield props.refetchComments();
@@ -213,49 +210,30 @@ export default function CaseDiscussion(props) {
             activeElementId.current = '';
         }
     };
-    // TODO: Re-enable after GraphQL migration of attachments
-    // const onAttachmentRemove = (uuid_removed) => {
-    //     updateAttacmentsAfterRemoval(dispatchDiscussion, uuid_removed, allDiscussions, discussionFiltersListState);
-    // };
-    // TODO: Re-enable after GraphQL migration of attachments
-    // const onAttachmentAdded = async () => {
-    //     ToastNotification.addSuccessMessage(t('Attachment(s) uploaded successfully'));
-    //     await updateDiscussionStateAttachments(
-    //         dispatchDiscussion,
-    //         caseNumber,
-    //         allDiscussions,
-    //         sort,
-    //         loggedInUsersAccount.data.secureSupport,
-    //         discussionFiltersListState,
-    //         dispatchCaseDetailsHydraAttachments
-    //     );
-    // };
-    // TODO: Re-enable after GraphQL migration of attachments
-    // const onMetadataUpdate = (attachmentId: string, updatedAttachment) => {
-    //     updateAttachment(dispatchDiscussion, attachmentId, updatedAttachment, allDiscussions);
-    // };
-    // TODO: Re-enable after GraphQL migration of attachments
-    // const downloadAttachment = async ({ caseNumber, uuid, name }) => {
-    //     const tempToastId = ToastNotification.addInfoMessage(t('Starting file download'));
-    //     try {
-    //         await caseAttachments.downloadAttachmentS3(
-    //             caseNumber,
-    //             uuid,
-    //             name,
-    //             false,
-    //             loggedInUsersAccount.data.secureSupport
-    //         );
-    //     } catch (e) {
-    //         ToastNotification.addDangerMessage(
-    //             t(`Could not download {{filename}}: {{error}}`, {
-    //                 filename: name,
-    //                 error: e?.message,
-    //             })
-    //         );
-    //     } finally {
-    //         tempToastId && ToastNotification.clearToast(tempToastId);
-    //     }
-    // };
+    const onAttachmentRemove = (uuid_removed) => {
+        updateAttacmentsAfterRemoval(dispatchDiscussion, uuid_removed, allDiscussions, discussionFiltersListState);
+    };
+    const onAttachmentAdded = () => __awaiter(this, void 0, void 0, function* () {
+        yield updateDiscussionStateAttachments(dispatchDiscussion, caseNumber, allDiscussions, sort, discussionFiltersListState, dispatchCaseDetailsHydraAttachments, apolloClient, caseSalesforceId);
+    });
+    const onMetadataUpdate = (attachmentId, updatedAttachment) => {
+        updateAttachment(dispatchDiscussion, attachmentId, updatedAttachment, allDiscussions);
+    };
+    const downloadAttachment = ({ caseNumber: attachmentCaseNumber, uuid, name }) => {
+        const tempToastId = ToastNotification.addInfoMessage(t('Starting file download'));
+        try {
+            downloadCaseAttachment(attachmentCaseNumber, uuid, name);
+        }
+        catch (e) {
+            ToastNotification.addDangerMessage(t('Could not download {{filename}}: {{error}}', {
+                filename: name,
+                error: e === null || e === void 0 ? void 0 : e.message,
+            }));
+        }
+        finally {
+            tempToastId && ToastNotification.clearToast(tempToastId);
+        }
+    };
     useEffect(() => {
         if (discussionSectionWidth && shouldRenderRVComponent) {
             cellMeasureCache && cellMeasureCache.clearAll();
@@ -282,7 +260,9 @@ export default function CaseDiscussion(props) {
     const renderCaseCommentElement = (discussion) => {
         if (isEmpty(discussion) || isEmpty(discussion.item))
             return null;
-        return (React.createElement("div", { "data-tracking-id": "discussion-elements", key: discussion.item.id }, discussion.discussionType === DiscussionType.COMMENT && (React.createElement(CaseComments, { caseNumber: caseNumber, ref: discussionIdFromUrl === discussion.item.id ? activeDiscussionElementRef : null, comment: discussion.item, onFeedBackUpdate: () => { }, feedback: discussion.feedback, accountNumber: props.accountNumber, onReply: onReply, showJumpToComment: !isEmpty(searchCommentText), onJumpToComment: onJumpToComment, downloadAttachment: () => { } }))));
+        return (React.createElement("div", { "data-tracking-id": "discussion-elements", key: discussion.item.id },
+            discussion.discussionType === DiscussionType.COMMENT && (React.createElement(CaseComments, { caseNumber: caseNumber, ref: discussionIdFromUrl === discussion.item.id ? activeDiscussionElementRef : null, comment: discussion.item, onFeedBackUpdate: () => { }, feedback: discussion.feedback, accountNumber: props.accountNumber, onReply: onReply, showJumpToComment: !isEmpty(searchCommentText), onJumpToComment: onJumpToComment, downloadAttachment: downloadAttachment })),
+            discussion.discussionType === DiscussionType.ATTACHMENT && (React.createElement(CaseAttachment, { attachment: discussion.item, onAttachmentRemove: onAttachmentRemove, onMetadataUpdate: onMetadataUpdate, showJumpToComment: !isEmpty(searchCommentText), onJumpToComment: onJumpToComment, downloadAttachment: downloadAttachment, ref: discussionIdFromUrl === discussion.item.id ? activeDiscussionElementRef : null }))));
     };
     const rowRenderer = ({ index, parent, key, style, }) => {
         const discussion = comuteSearchedComments[index];
@@ -354,7 +334,8 @@ export default function CaseDiscussion(props) {
     const onSortToggle = (toggleRef) => (React.createElement(MenuToggle, { ref: toggleRef, onClick: onSortToggleClick, isExpanded: isSortOpen, isFullWidth: true }, sort.name));
     return (React.createElement(React.Fragment, null,
         React.createElement(ErrorBoundary, { errorMsgInfo: { message: t('There was an error loading post comment section') } },
-            React.createElement(PostComment, { caseNumber: caseNumber, allDiscussions: allDiscussions, onCommentAdded: onCommentAdded, commentText: replyCommentText, onCommentClear: resetReplyComment, commentCreator: replyCommentCreator, defaultIsPublic: replyingToPrivateComment === null ? replyingToPrivateComment : !replyingToPrivateComment })),
+            React.createElement(AttachmentContextProvider, null,
+                React.createElement(PostComment, { caseNumber: caseNumber, allDiscussions: allDiscussions, onCommentAdded: onCommentAdded, onAttachmentAdded: onAttachmentAdded, onAttachmentRemove: onAttachmentRemove, commentText: replyCommentText, onCommentClear: resetReplyComment, commentCreator: replyCommentCreator, defaultIsPublic: replyingToPrivateComment === null ? replyingToPrivateComment : !replyingToPrivateComment }))),
         props.commentsLoading && allDiscussions.length === 0 && React.createElement(LoadingIndicator, { size: "sm" }),
         props.commentsError && allDiscussions.length === 0 && (React.createElement(AlertMessage, { variant: AlertType.DANGER, show: true, title: t('Failed to load comments. Try refreshing.') })),
         !props.commentsLoading && !props.commentsError && allDiscussions.length === 0 && (React.createElement(Trans, null, "No comments")),

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/PostComment/useMarkdownFileUploader.d.ts

@@ -2,10 +2,9 @@ import { IAttachment } from '@cee-eng/hydrajs/@types/models/attachment';
 interface IProps {
     onAttachmentAdded: () => void;
     caseNumber: string;
-    secureSupport: boolean;
 }
 export declare const FILE_SIZE_LIMIT: number;
-export declare function useMarkdownFileUploader({ caseNumber, secureSupport, onAttachmentAdded }: IProps): {
+export declare function useMarkdownFileUploader({ caseNumber, onAttachmentAdded }: IProps): {
     isMarkdownFileUploadInProgress: boolean;
     isDeletingFile: boolean;
     isUploadingFile: boolean;

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/PostComment/useMarkdownFileUploader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMarkdownFileUploader.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/PostComment/useMarkdownFileUploader.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAcxE,UAAU,MAAM;IACZ,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,eAAe,QAAkB,CAAC;AAE/C,wBAAgB,uBAAuB,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAE,EAAE,MAAM;;;;;;+BAyDpD,OAAO,CAAC,WAAW,CAAC;;EA2C/D"}
+{"version":3,"file":"useMarkdownFileUploader.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/PostComment/useMarkdownFileUploader.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAexE,UAAU,MAAM;IACZ,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,eAAe,QAAkB,CAAC;AAE/C,wBAAgB,uBAAuB,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE,MAAM;;;;;;+BA0DrC,OAAO,CAAC,WAAW,CAAC;;EA2C/D"}

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/PostComment/useMarkdownFileUploader.js

@@ -7,28 +7,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { caseAttachments } from '@cee-eng/hydrajs';
+import { useApolloClient } from '@apollo/client/react';
 import { ToastNotification, useConfirmation, useFetch } from '@rh-support/components';
-import { pendoTrackEvent } from '@rh-support/utils';
+import { deleteCaseAttachment, pendoTrackEvent } from '@rh-support/utils';
 import React, { useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { useCaseSelector } from '../../../../../context/CaseContext';
 import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../../../../context/CaseDiscussionTabContext';
 import { useS3Upload } from '../../../../../hooks/useS3Upload';
 import { updateAttacmentsAfterRemoval } from '../../../../../reducers/CaseDiscussionTabReducer';
 import { markdownInlineFileSelectEvent } from '../../../../shared/Constants';
 export const FILE_SIZE_LIMIT = 2 * 1024 * 1000;
-export function useMarkdownFileUploader({ caseNumber, secureSupport, onAttachmentAdded }) {
+export function useMarkdownFileUploader({ caseNumber, onAttachmentAdded }) {
     const [isMarkdownFileUploadInProgress, setIsMarkdownFileUploadinProgress] = useState(false);
-    // We need one more state to check if user canceled current upload
-    // Reason to use `useRef` as we need up to date state value in callback
     const isMarkdownFileUploadCanceled = useRef(false);
-    const { request: deleteAttachmentRequest, isFetching: isDeletingFile } = useFetch(caseAttachments.deleteAttachment, {
+    const apolloClient = useApolloClient();
+    const { caseSalesforceId } = useCaseSelector((state) => ({
+        caseSalesforceId: state.caseDetails.id,
+    }));
+    const { request: deleteAttachmentRequest, isFetching: isDeletingFile } = useFetch(deleteCaseAttachment, {
         propgateErrors: true,
     });
     const { discussionFiltersListState, allDiscussions } = useCaseDiscussionTabStateContext();
     const dispatchDiscussion = useCaseDiscussionTabDispatchContext();
     const confirm = useConfirmation();
-    const { uploadFile, isUploadingFile } = useS3Upload(caseNumber, secureSupport);
+    // TODO: Re-enable when Hydra/GraphQL attachment APIs support secure support again
+    // Previously: useS3Upload(caseNumber, secureSupport)
+    const { uploadFile, isUploadingFile } = useS3Upload(caseNumber, apolloClient, caseSalesforceId);
     const markdownFileUploadListener = (progress, abort) => {
         // If user canceled upload then don't enable uploading label and abort
         if (isMarkdownFileUploadCanceled.current) {
@@ -78,7 +83,7 @@ export function useMarkdownFileUploader({ caseNumber, secureSupport, onAttachmen
             });
             try {
                 ToastNotification.addInfoMessage(t('Deleting attachment: {{file}}', { file: attachment.fileName }));
-                yield deleteAttachmentRequest(attachment.caseNumber, attachment.uuid, secureSupport);
+                yield deleteAttachmentRequest(attachment.caseNumber, attachment.uuid);
                 ToastNotification.addSuccessMessage(t('Successfully deleted attachment: {{file}}', { file: attachment.fileName }));
                 updateAttacmentsAfterRemoval(dispatchDiscussion, attachment.uuid, allDiscussions, discussionFiltersListState);
             }

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/PostComment.d.ts

@@ -5,6 +5,8 @@ interface IProps {
     commentText?: string;
     commentCreator?: string;
     onCommentAdded?: () => Promise<void>;
+    onAttachmentAdded?: () => void;
+    onAttachmentRemove?: (uuid: string) => void;
     onCommentClear?: () => void;
     /**
      * Controls the initial visibility toggle state.

package/lib/esm/components/CaseEditView/Tabs/CaseDiscussion/PostComment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostComment.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/PostComment.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA+D,MAAM,OAAO,CAAC;AAMpF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAqB5E,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAIrC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B;;;;;OAKG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,WAAW,EAAE,CAAC;CACjC;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,qBA4VxC"}
+{"version":3,"file":"PostComment.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/PostComment.tsx"],"names":[],"mappings":"AAaA,OAAO,KAA+D,MAAM,OAAO,CAAC;AAOpF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAkB5E,UAAU,MAAM;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B;;;;;OAKG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,WAAW,EAAE,CAAC;CACjC;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,qBAuaxC"}