@rh-support/troubleshoot 0.2.84 → 0.2.85

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

@@ -12,6 +12,7 @@ export declare function useMarkdownFileUploader({ caseNumber, secureSupport, onA
     onFileSelect: (selectedImage: any) => void;
     onFileAttach: (files: any, isPublic: any) => Promise<void>;
     onFileDelete: (attachment: Partial<IAttachment>) => Promise<void>;
+    cancelFileUpload: () => void;
 };
 export {};
 //# sourceMappingURL=useMarkdownFileUploader.d.ts.map

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;;;;;;+BAqCpD,QAAQ,WAAW,CAAC;EA0C/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;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,QAAQ,WAAW,CAAC;;EA2C/D"}

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { caseAttachments } from '@cee-eng/hydrajs';
 import { ToastNotification, useConfirmation, useFetch } from '@rh-support/components';
 import { pendoTrackEvent } from '@rh-support/utils';
-import React, { useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useCaseDiscussionTabDispatchContext, useCaseDiscussionTabStateContext, } from '../../../../../context/CaseDiscussionTabContext';
 import { useS3Upload } from '../../../../../hooks/useS3Upload';
@@ -19,6 +19,9 @@ import { markdownInlineFileSelectEvent } from '../../../../shared/Constants';
 export const FILE_SIZE_LIMIT = 2 * 1024 * 1000;
 export function useMarkdownFileUploader({ caseNumber, secureSupport, 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, {
         propgateErrors: true,
     });
@@ -26,13 +29,23 @@ export function useMarkdownFileUploader({ caseNumber, secureSupport, onAttachmen
     const dispatchDiscussion = useCaseDiscussionTabDispatchContext();
     const confirm = useConfirmation();
     const { uploadFile, isUploadingFile } = useS3Upload(caseNumber, secureSupport);
-    const markdownFileUploadListener = (progress) => {
-        setIsMarkdownFileUploadinProgress(true);
+    const markdownFileUploadListener = (progress, abort) => {
+        // If user canceled upload then don't enable uploading label and abort
+        if (isMarkdownFileUploadCanceled.current) {
+            abort();
+        }
+        else {
+            setIsMarkdownFileUploadinProgress(true);
+        }
     };
     const { t } = useTranslation();
     const onImageUploadComplete = () => __awaiter(this, void 0, void 0, function* () {
-        yield onAttachmentAdded();
+        // check if user canceled upload and if not start the upload sequence
+        if (!isMarkdownFileUploadCanceled.current) {
+            yield onAttachmentAdded();
+        }
         setIsMarkdownFileUploadinProgress(false);
+        isMarkdownFileUploadCanceled.current = false;
     });
     const onFileAttach = (files, isPublic) => __awaiter(this, void 0, void 0, function* () {
         setIsMarkdownFileUploadinProgress(true);
@@ -43,6 +56,13 @@ export function useMarkdownFileUploader({ caseNumber, secureSupport, onAttachmen
         });
         onImageUploadComplete();
     });
+    /**
+     * Cancel upload function which will take care to abort current operation and marking upload progress false
+     */
+    const cancelFileUpload = () => {
+        isMarkdownFileUploadCanceled.current = true;
+        setIsMarkdownFileUploadinProgress(false);
+    };
     const onFileSelect = (selectedImage) => {
         pendoTrackEvent(markdownInlineFileSelectEvent);
     };
@@ -77,5 +97,6 @@ export function useMarkdownFileUploader({ caseNumber, secureSupport, onAttachmen
         onFileSelect,
         onFileAttach,
         onFileDelete,
+        cancelFileUpload,
     };
 }

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":"AAoCA,OAAO,EAAkB,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAqB5F,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,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,WAAW,EAAE,CAAC;CACjC;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,eA2bxC"}
+{"version":3,"file":"PostComment.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CaseEditView/Tabs/CaseDiscussion/PostComment.tsx"],"names":[],"mappings":"AAoCA,OAAO,EAAkB,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAqB5F,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,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,WAAW,EAAE,CAAC;CACjC;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,eAkcxC"}

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

@@ -54,7 +54,7 @@ export function PostComment(props) {
     const [isProcessing, setIsProcessing] = useState(isPostingComment || isUploadingAttachments);
     const { globalMetadataState: { loggedInUser, loggedInUserRights, loggedInUsersAccount, pcmConfig }, } = useContext(GlobalMetadataStateContext);
     const allowInlineImagesInMarkdown = getConfigField(pcmConfig.data, 'allowInlineImagesInMarkdown', PCM_CONFIG_FIELD_TYPE.FEATURE_FLAG);
-    const { onFileSelect, onFileAttach, onFileDelete, isUploadingFile, isMarkdownFileUploadInProgress } = useMarkdownFileUploader({
+    const { onFileSelect, onFileAttach, onFileDelete, isUploadingFile, isMarkdownFileUploadInProgress, cancelFileUpload, } = useMarkdownFileUploader({
         caseNumber,
         secureSupport: loggedInUsersAccount.data.secureSupport,
         onAttachmentAdded: props.onAttachmentAdded,
@@ -112,6 +112,7 @@ export function PostComment(props) {
     const onCancelClick = () => {
         resetCommentSection();
         resetAttachmentSection();
+        cancelFileUpload();
     };
     const loggedInUserSSO = loggedInUserRights.data.getSSOUsername();
     // https://github.com/facebook/react/issues/19240

package/lib/esm/hooks/useS3Upload.d.ts

@@ -3,7 +3,7 @@ export declare function useS3Upload(idToUploadTo: any, isSecureSupport: any): {
         file: any;
         description?: string;
         isPrivate?: boolean;
-        listenerFn?: (percent: any) => void;
+        listenerFn?: (percent: any, abort: any) => void;
     }) => Promise<string>;
     isUploadingFile: boolean;
 };

package/lib/esm/hooks/useS3Upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useS3Upload.d.ts","sourceRoot":"","sources":["../../../src/hooks/useS3Upload.ts"],"names":[],"mappings":"AASA,wBAAgB,WAAW,CAAC,YAAY,KAAA,EAAE,eAAe,KAAA;;;;;;;;EAyExD"}
+{"version":3,"file":"useS3Upload.d.ts","sourceRoot":"","sources":["../../../src/hooks/useS3Upload.ts"],"names":[],"mappings":"AASA,wBAAgB,WAAW,CAAC,YAAY,KAAA,EAAE,eAAe,KAAA;;;;;;;;EA0ExD"}

package/lib/esm/hooks/useS3Upload.js

@@ -28,7 +28,7 @@ export function useS3Upload(idToUploadTo, isSecureSupport) {
             reader.readAsArrayBuffer(file.slice(0, 10));
         });
     });
-    const uploadFile = ({ file, description = '', isPrivate = false, listenerFn = (percent) => { } }) => __awaiter(this, void 0, void 0, function* () {
+    const uploadFile = ({ file, description = '', isPrivate = false, listenerFn = (percent, abort) => { } }) => __awaiter(this, void 0, void 0, function* () {
         try {
             yield getFileAccessDetails(file);
         }
@@ -43,7 +43,8 @@ export function useS3Upload(idToUploadTo, isSecureSupport) {
             const percent = decimal * 100;
             // const verifyingUpdate = decimal === 1;
             const currentUploadProgress = Math.floor(percent);
-            listenerFn(currentUploadProgress);
+            // Forwarding abort single to parent callback function
+            listenerFn(currentUploadProgress, abort);
         };
         const putObjectRequest = {
             Body: file,

package/lib/esm/scss/_pf4-overrides.scss

@@ -301,3 +301,7 @@ section.grid-aside-content pfe-accordion {
     --pfe-accordion--FontSize--header: 16px;
     --pfe-accordion--FontWeight--header: 600;
 }
+// override added padding
+div.pf-c-alert__description div.ea-rule p a.pf-c-button {
+    padding: 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "0.2.84",
+    "version": "0.2.85",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -143,5 +143,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "4fce3da5901527ba41788f587ab1852eff161cee"
+    "gitHead": "1de6c9240e3b6ee20e698385182d64e4501c6fe5"
 }