@rh-support/troubleshoot 2.6.306 → 2.6.309

package/lib/esm/components/shared/fileUpload/useFileUploader.js

@@ -28,7 +28,7 @@ export function useFileUploader(props) {
     const caseSalesforceIdRef = useRef();
     const { request: deleteSessionAttachment } = useFetch(sessionAttachments.deleteSesionAttachment);
     const { request: deleteCaseAttachmentRequest } = useFetch(deleteCaseAttachment);
-    const { idToUploadTo, caseSalesforceId, needsAnalyzing, isSessionId, autoUploadOnSelect, onUploadClick } = props;
+    const { idToUploadTo, caseSalesforceId, needsAnalyzing, isSessionId, autoUploadOnSelect, onUploadClick, onCaseFileUploaded, } = props;
     useEffect(() => {
         if (caseSalesforceId) {
             caseSalesforceIdRef.current = caseSalesforceId;
@@ -83,6 +83,9 @@ export function useFileUploader(props) {
             debounceSessionMetadataUpdate(editedLocalFile, changes);
     });
     const onFileRemoveLocal = (fileIndexToRemove, file) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        // Stop in-flight S3 transfer if Remove is used while upload/verify is still active
+        (_b = (_a = file.uploadProgress).onAbort) === null || _b === void 0 ? void 0 : _b.call(_a, fileIndexToRemove);
         const selectedLocalFiles = attachmentState.caseFiles.selectedLocalFiles;
         if (!isUploadingAttachment(selectedLocalFiles) && !isAnalysingAnyAttachment(selectedLocalFiles)) {
             onFileRemove(dispatch, fileIndexToRemove);
@@ -90,6 +93,7 @@ export function useFileUploader(props) {
         else {
             updateUploadMetadata(dispatch, fileIndexToRemove, {
                 uploadStatus: UploadStatusConstants.deleted,
+                onAbort: undefined,
             });
         }
         isUploadedSuccessfully(file) && isSessionId && deleteSessionAttachment(idToUploadTo, file.attachmentId);
@@ -135,6 +139,7 @@ export function useFileUploader(props) {
             slowUploadConfig,
             apolloClient: !isSessionId ? apolloClient : undefined,
             caseSalesforceId: !isSessionId ? caseSalesforceIdRef.current : undefined,
+            onCaseFileUploaded: !isSessionId ? onCaseFileUploaded : undefined,
         });
     });
     const onUploadFile = (fileIndex) => __awaiter(this, void 0, void 0, function* () {
@@ -150,6 +155,7 @@ export function useFileUploader(props) {
             slowUploadConfig,
             apolloClient: !isSessionId ? apolloClient : undefined,
             caseSalesforceId: !isSessionId ? caseSalesforceIdRef.current : undefined,
+            onCaseFileUploaded: !isSessionId ? onCaseFileUploaded : undefined,
         });
     });
     return {

package/lib/esm/css/case.css

@@ -315,23 +315,28 @@ button,
 }
 
 .case-comment-input-container {
-    display: -ms-flexbox;
     display: flex;
+    align-items: center;
+    gap: 0.5rem;
+}
+
+.case-comment-input-container .case-comment-search-input-wrapper {
     position: relative;
+    flex: 1;
 }
 
-.case-comment-input-container input {
-    padding-right: 35px;
-    margin-right: 1rem;
+.case-comment-input-container .case-comment-search-input-wrapper input {
+    padding-right: 2rem;
 }
 
 .case-comment-input-container .clear-btn {
     position: absolute;
-    top: 8px;
-    right: 92px;
+    top: 50%;
+    right: 0.25rem;
+    transform: translateY(-50%);
     font-size: 14px;
     background-color: transparent;
-    padding: 0 1rem;
+    padding: 0 0.5rem;
 }
 
 .ReactVirtualized__List:focus {

package/lib/esm/hooks/useCaseComments/mapCaseComment.d.ts

@@ -3,7 +3,7 @@ import { ICaseCommentNode, IGetCaseCommentsQueryResponse } from './types';
 /**
  * The GraphQL API HTML-encodes comment bodies on storage/retrieval
  * (e.g. > becomes >, & becomes &). Two-pass decode
- * handles both single- and double-encoded entities.
+ * handles both single- and double-encoded entities, plus numeric refs.
  *
  * TODO: The double-encoding is a backend bug in the Salesforce UIAPI — it encodes on both
  * write and read. Once the backend is fixed, replace with a single `unescape(text)` call.

package/lib/esm/hooks/useCaseComments/mapCaseComment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapCaseComment.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useCaseComments/mapCaseComment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAE1E;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,CAKzG;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG7E;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAEvD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,YAAY,CAuBvE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,6BAA6B,GAAG,SAAS,GAAG,YAAY,EAAE,CAOvG"}
+{"version":3,"file":"mapCaseComment.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useCaseComments/mapCaseComment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAY1E;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIvD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,CAKzG;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAG7E;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAEvD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,YAAY,CAuBvE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,6BAA6B,GAAG,SAAS,GAAG,YAAY,EAAE,CAOvG"}

package/lib/esm/hooks/useCaseComments/mapCaseComment.js

@@ -1,14 +1,25 @@
 import { unescape } from 'lodash';
+/**
+ * Decodes numeric (&#nn;) and hex (&#xHH;) HTML character references
+ * that lodash `unescape` does not handle.
+ */
+function decodeNumericEntities(text) {
+    return text
+        .replaceAll(/&#x([0-9a-fA-F]+);/g, (_, hex) => String.fromCodePoint(Number.parseInt(hex, 16)))
+        .replaceAll(/&#(\d+);/g, (_, dec) => String.fromCodePoint(Number.parseInt(dec, 10)));
+}
 /**
  * The GraphQL API HTML-encodes comment bodies on storage/retrieval
  * (e.g. > becomes >, & becomes &). Two-pass decode
- * handles both single- and double-encoded entities.
+ * handles both single- and double-encoded entities, plus numeric refs.
  *
  * TODO: The double-encoding is a backend bug in the Salesforce UIAPI — it encodes on both
  * write and read. Once the backend is fixed, replace with a single `unescape(text)` call.
  */
 export function decodeHtmlEntities(text) {
-    return unescape(unescape(text));
+    let decoded = unescape(unescape(text));
+    decoded = decodeNumericEntities(decoded);
+    return decoded;
 }
 /**
  * Derives the comment author type with priority: Associate > Customer > Partner.
@@ -50,7 +61,7 @@ export function mapCaseCommentNode(node) {
         createdDate: (_t = (_s = node.CreatedDate) === null || _s === void 0 ? void 0 : _s.value) !== null && _t !== void 0 ? _t : '',
         visibility: visibility !== null && visibility !== void 0 ? visibility : undefined,
         isPublic: deriveIsPublic(visibility),
-        contentType: 'plaintext',
+        contentType: 'markdown',
         isDraft: false,
         publishedDate: '',
     };

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

@@ -0,0 +1,21 @@
+export interface LabelOption {
+    id: string;
+    name: string;
+}
+export interface LabelLink {
+    linkId: string;
+    labelId: string;
+}
+interface UseCaseLabelLinksResult {
+    availableLabels: LabelOption[];
+    assignedLinks: LabelLink[];
+    selectedLabelIds: string[];
+    loading: boolean;
+    mutating: boolean;
+    setAssignedLinks: React.Dispatch<React.SetStateAction<LabelLink[]>>;
+    createLink: (caseId: string, labelId: string) => Promise<string | undefined>;
+    deleteLink: (linkId: string) => Promise<void>;
+}
+export declare function useCaseLabelLinks(salesforceAccountId?: string, caseId?: string): UseCaseLabelLinksResult;
+export {};
+//# sourceMappingURL=useCaseLabelLinkMutations.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useCaseLabelLinkMutations.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCaseLabelLinkMutations.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,WAAW;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,uBAAuB;IAC7B,eAAe,EAAE,WAAW,EAAE,CAAC;IAC/B,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IACpE,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7E,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD;AAED,wBAAgB,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,uBAAuB,CA6FxG"}

package/lib/esm/hooks/useCaseLabelLinkMutations.js

@@ -0,0 +1,84 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useApolloClient, useMutation } from '@apollo/client/react';
+import { CREATE_CASE_LABEL_LINK, DELETE_CASE_LABEL_LINK, GET_CASE_LABEL_LINKS, GET_CASE_LABELS, } from '@rh-support/utils';
+import { useCallback, useEffect, useState } from 'react';
+export function useCaseLabelLinks(salesforceAccountId, caseId) {
+    const client = useApolloClient();
+    const [availableLabels, setAvailableLabels] = useState([]);
+    const [assignedLinks, setAssignedLinks] = useState([]);
+    const [loading, setLoading] = useState(false);
+    const fetchData = useCallback(() => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        if (!salesforceAccountId || !caseId)
+            return;
+        setLoading(true);
+        try {
+            const [labelsResult, linksResult] = yield Promise.all([
+                client.query({
+                    query: GET_CASE_LABELS,
+                    variables: { where: { Account__c: { eq: salesforceAccountId } } },
+                    fetchPolicy: 'network-only',
+                }),
+                client.query({
+                    query: GET_CASE_LABEL_LINKS,
+                    variables: { where: { Case__c: { eq: caseId } } },
+                    fetchPolicy: 'network-only',
+                }),
+            ]);
+            const labelEdges = (_e = (_d = (_c = (_b = (_a = labelsResult.data) === null || _a === void 0 ? void 0 : _a.redhat_support_uiapi) === null || _b === void 0 ? void 0 : _b.query) === null || _c === void 0 ? void 0 : _c.RedHatSupportCaseLabel__c) === null || _d === void 0 ? void 0 : _d.edges) !== null && _e !== void 0 ? _e : [];
+            setAvailableLabels(labelEdges
+                .map(({ node }) => { var _a, _b; return ({ id: node.Id, name: (_b = (_a = node.Name) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : '' }); })
+                .filter((l) => l.id && l.name));
+            const linkEdges = (_k = (_j = (_h = (_g = (_f = linksResult.data) === null || _f === void 0 ? void 0 : _f.redhat_support_uiapi) === null || _g === void 0 ? void 0 : _g.query) === null || _h === void 0 ? void 0 : _h.RedHatSupportCaseLabelLink__c) === null || _j === void 0 ? void 0 : _j.edges) !== null && _k !== void 0 ? _k : [];
+            setAssignedLinks(linkEdges
+                .filter(({ node }) => { var _a; return node.Id && ((_a = node.Label__c) === null || _a === void 0 ? void 0 : _a.value); })
+                .map(({ node }) => ({
+                linkId: node.Id,
+                labelId: node.Label__c.value,
+            })));
+        }
+        catch (_l) {
+            setAvailableLabels([]);
+            setAssignedLinks([]);
+        }
+        finally {
+            setLoading(false);
+        }
+    }), [client, salesforceAccountId, caseId]);
+    useEffect(() => {
+        fetchData();
+    }, [fetchData]);
+    const [createMutate, { loading: createLoading }] = useMutation(CREATE_CASE_LABEL_LINK);
+    const createLink = useCallback((caseSfId, labelId) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const result = yield createMutate({
+            variables: {
+                input: { RedHatSupportCaseLabelLink__c: { Case__c: caseSfId, Label__c: labelId } },
+            },
+        });
+        return (_d = (_c = (_b = (_a = result.data) === null || _a === void 0 ? void 0 : _a.redhat_support_uiapi) === null || _b === void 0 ? void 0 : _b.CaseLabelLink__cCreate) === null || _c === void 0 ? void 0 : _c.RedHatSupportRecord) === null || _d === void 0 ? void 0 : _d.Id;
+    }), [createMutate]);
+    const [deleteMutate, { loading: deleteLoading }] = useMutation(DELETE_CASE_LABEL_LINK);
+    const deleteLink = useCallback((linkId) => __awaiter(this, void 0, void 0, function* () {
+        yield deleteMutate({ variables: { id: linkId } });
+    }), [deleteMutate]);
+    const selectedLabelIds = assignedLinks.map((link) => link.labelId);
+    return {
+        availableLabels,
+        assignedLinks,
+        selectedLabelIds,
+        loading,
+        mutating: createLoading || deleteLoading,
+        setAssignedLinks,
+        createLink,
+        deleteLink,
+    };
+}

package/lib/esm/reducers/CaseDiscussionTabReducer.d.ts.map

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

package/lib/esm/reducers/CaseDiscussionTabReducer.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { fetchCaseAttachmentsViaGraphQL, fetchCaseDetailsByCaseNumber, getApiResourceObject, } from '@rh-support/utils';
+import { fetchCaseAttachmentsViaGraphQLWithRetry, fetchCaseDetailsByCaseNumber, getApiResourceObject, mergeAttachmentsByUuid, } from '@rh-support/utils';
 import filter from 'lodash/filter';
 import findIndex from 'lodash/findIndex';
 import isEqual from 'lodash/isEqual';
@@ -233,7 +233,11 @@ export const updateDiscussionStateAttachments = (dispatch, caseNumber, allDiscus
         if (!resolvedCaseSalesforceId) {
             throw new Error('Missing Salesforce case id');
         }
-        const attachments = yield fetchCaseAttachmentsViaGraphQL(apolloClient, caseNumber, resolvedCaseSalesforceId);
+        const existingAttachments = filter(allDiscussions, (o) => o.discussionType === DiscussionType.ATTACHMENT).map((discussion) => discussion.item);
+        const fetchedAttachments = yield fetchCaseAttachmentsViaGraphQLWithRetry(apolloClient, caseNumber, resolvedCaseSalesforceId, 
+        // After a successful upload batch we expect at least one new attachment beyond what discussion already shows
+        { minExpectedCount: existingAttachments.length + 1 });
+        const attachments = mergeAttachmentsByUuid(existingAttachments, fetchedAttachments);
         const allAttachments = attachments.map((attachment) => ({
             item: Object.assign(Object.assign({}, attachment), { lastModifiedDate: attachment.lastModifiedDate || attachment.createdDate }),
             last_modified_date: attachment.lastModifiedDate || attachment.createdDate,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/troubleshoot",
-    "version": "2.6.306",
+    "version": "2.6.309",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -52,11 +52,11 @@
         "@progress/kendo-licensing": "1.3.5",
         "@progress/kendo-react-pdf": "^5.16.0",
         "@redux-devtools/extension": "^3.3.0",
-        "@rh-support/components": "2.5.187",
-        "@rh-support/react-context": "2.5.281",
+        "@rh-support/components": "2.5.190",
+        "@rh-support/react-context": "2.5.284",
         "@rh-support/types": "2.0.26",
-        "@rh-support/user-permissions": "2.5.133",
-        "@rh-support/utils": "2.5.115",
+        "@rh-support/user-permissions": "2.5.136",
+        "@rh-support/utils": "2.5.118",
         "@types/react-redux": "^7.1.33",
         "@types/redux": "^3.6.0",
         "date-fns": "3.6.0",
@@ -126,5 +126,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "62de68194f68d9d3546ff5e6569d2d5137609e8e"
+    "gitHead": "9017d17207b6357a27edbab889de8f10696e745b"
 }