@rh-support/troubleshoot 2.0.1 → 2.0.2-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"CaseGroup.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/CaseGroup.tsx"],"names":[],"mappings":"AAkBA,UAAU,MAAM;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAWD,iBAAS,SAAS,CAAC,KAAK,EAAE,MAAM,eA6M/B;AAED,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"CaseGroup.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseInformation/CaseGroup.tsx"],"names":[],"mappings":"AAmBA,UAAU,MAAM;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAWD,iBAAS,SAAS,CAAC,KAAK,EAAE,MAAM,eAyO/B;AAED,eAAe,SAAS,CAAC"}
@@ -16,6 +16,7 @@ import isEqual from 'lodash/isEqual';
16
16
  import React, { useContext, useEffect, useState } from 'react';
17
17
  import { Trans, useTranslation } from 'react-i18next';
18
18
  import { useCaseDispatch, useCaseSelector } from '../../context/CaseContext';
19
+ import { RouteContext } from '../../context/RouteContext';
19
20
  import { useCaseUpdateErrorMessage } from '../../hooks/useCaseUpdateErrorMessage';
20
21
  import { setCaseDetails, setSelectedCaseGroupUsers, updateCaseDetails } from '../../reducers/CaseReducer';
21
22
  import { CaseValuesToWatch } from '../shared/Constants';
@@ -40,7 +41,9 @@ function CaseGroup(props) {
40
41
  groupName: state.caseDetails.groupName,
41
42
  }), isEqual);
42
43
  const caseDispatch = useCaseDispatch();
43
- const [selectedCaseGroup, setSelectedCaseGroup] = useState(emptyCaseGroup);
44
+ const { routeState: { showValidationErrorAlert }, } = useContext(RouteContext);
45
+ const isGroupMandatory = selectedAccountDetails.data.requireCGroupOnCreate;
46
+ const [selectedCaseGroup, setSelectedCaseGroup] = useState(isGroupMandatory ? undefined : emptyCaseGroup);
44
47
  const [isCaseGroupInvalid, setCaseGroupInvalid] = useState(false);
45
48
  const [isSelectedUngroupedInvalid, setIsSelectedUngroupedInvalid] = useState(false);
46
49
  const [isCaseGroupUpdating, setCaseGroupUpdating] = useState(false);
@@ -50,13 +53,6 @@ function CaseGroup(props) {
50
53
  const [localGroupChange, setLocalGroupChange] = useState(false);
51
54
  const afterGroupLocalChange = () => setLocalGroupChange(false);
52
55
  const groupComparator = (value, pvalue) => value && pvalue && !isEmpty(value.groupNum) && !isEmpty(pvalue.groupNum) && value.groupNum !== pvalue.groupNum;
53
- const isGroupMandatory = selectedAccountDetails.data.requireCGroupOnCreate;
54
- const isInValidSelectedGroup = (selectedItem) => {
55
- var _a;
56
- const isInvalidSelectedGroup = isGroupMandatory && ((_a = selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value) === null || _a === void 0 ? void 0 : _a.groupNum) === '-1';
57
- setIsSelectedUngroupedInvalid(isInvalidSelectedGroup);
58
- return isInvalidSelectedGroup;
59
- };
60
56
  const isInvalidateCaseGroup = (selectedItem) => {
61
57
  const isInValidGroup = isEmpty(selectedItem) || !selectedItem.label;
62
58
  setCaseGroupInvalid(isInValidGroup);
@@ -78,20 +74,28 @@ function CaseGroup(props) {
78
74
  }
79
75
  });
80
76
  const onCaseGroupChange = (selection) => __awaiter(this, void 0, void 0, function* () {
81
- var _a;
82
- if ((!isInvalidateCaseGroup(selection) || !isInValidSelectedGroup(selection)) &&
83
- selection.value.groupNum !== groupNumber) {
77
+ var _a, _b;
78
+ if (!isInvalidateCaseGroup(selection) && selection.value.groupNum !== groupNumber) {
84
79
  const caseDetails = {
85
80
  groupNumber: selection.value.groupNum,
86
81
  groupName: ((_a = selection.value) === null || _a === void 0 ? void 0 : _a.name) || '',
87
82
  };
88
83
  if (!isEmpty(caseNumber)) {
89
84
  yield onCaseGroupUpdate(caseDetails);
85
+ setIsSelectedUngroupedInvalid(isGroupMandatory && (!selection.value.groupNum || selection.value.groupNum === '-1'));
90
86
  }
91
87
  else {
92
88
  setCaseDetails(caseDispatch, caseDetails);
93
89
  setSelectedCaseGroupUsers(caseDispatch, accountNumber, caseDetails.groupNumber, loggedInUserRights.data);
94
90
  }
91
+ setSelectedCaseGroup({
92
+ name: ((_b = selection.value) === null || _b === void 0 ? void 0 : _b.name) || '',
93
+ groupNum: selection.value.groupNum,
94
+ defaultMembers: [],
95
+ isDefault: false,
96
+ isPrivate: false,
97
+ members: [],
98
+ });
95
99
  setLocalGroupChange(true);
96
100
  }
97
101
  });
@@ -102,7 +106,8 @@ function CaseGroup(props) {
102
106
  if (isGroupMandatory) {
103
107
  // having group selected for case is mandatory, make 'UnGrouped Case' option disabled
104
108
  const listItems = list.map((item) => (Object.assign(Object.assign({}, item), { disabled: item.groupNum === '-1' })));
105
- return toOptions(listItems, {
109
+ // As group is mandatory, 'UnGrouped Case' cannot be selected we filter it out
110
+ return toOptions(listItems.filter((g) => g.groupNum !== '-1'), {
106
111
  labelKey: 'name',
107
112
  disabledKey: 'disabled',
108
113
  });
@@ -112,11 +117,12 @@ function CaseGroup(props) {
112
117
  }
113
118
  };
114
119
  const onOuterClickGroupCheck = (selectedItem) => {
115
- isInValidSelectedGroup(selectedItem);
116
120
  isInvalidateCaseGroup(selectedItem);
117
121
  };
118
122
  useEffect(() => {
119
123
  var _a, _b;
124
+ // case group may change outside of PCM. On group load check if we have a valid group
125
+ setIsSelectedUngroupedInvalid(isGroupMandatory && (!groupNumber || groupNumber === '-1'));
120
126
  if (groupNumber === undefined)
121
127
  return;
122
128
  if (((_b = (_a = ownersCaseGroups === null || ownersCaseGroups === void 0 ? void 0 : ownersCaseGroups.data) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0) {
@@ -134,14 +140,18 @@ function CaseGroup(props) {
134
140
  }
135
141
  const selectedGroup = find(ownersCaseGroups.data, (g) => g.groupNum === groupNumber);
136
142
  if (selectedGroup && selectedGroup.groupNum) {
137
- setSelectedCaseGroup(selectedGroup);
138
- // case group may change outside of PCM. On group load check if we have a valid group
139
- setIsSelectedUngroupedInvalid(isGroupMandatory && selectedGroup.groupNum === '-1');
143
+ if (isGroupMandatory && selectedGroup.groupNum === '-1') {
144
+ setCaseGroupInvalid(true);
145
+ }
146
+ else {
147
+ setSelectedCaseGroup(selectedGroup);
148
+ }
140
149
  }
141
150
  else {
142
151
  setCaseGroupInvalid(true);
143
152
  }
144
- }, [isGroupMandatory, groupNumber, ownersCaseGroups, caseNumber, groupName]);
153
+ // eslint-disable-next-line react-hooks/exhaustive-deps
154
+ }, [ownersCaseGroups, caseNumber, isGroupMandatory]);
145
155
  const onCaseGroupClear = () => __awaiter(this, void 0, void 0, function* () {
146
156
  try {
147
157
  yield onCaseGroupChange(toOption(emptyCaseGroup));
@@ -152,15 +162,16 @@ function CaseGroup(props) {
152
162
  }
153
163
  });
154
164
  const showHelperText = !isSelectedUngroupedInvalid || (!isCaseGroupInvalid && !isGroupMandatory);
165
+ const showEmptyValidationError = !caseNumber && showValidationErrorAlert && isCaseGroupInvalid;
155
166
  return (React.createElement("div", { className: "form-group" },
156
167
  React.createElement("label", { htmlFor: "get-support-group" },
157
168
  React.createElement(Trans, null, "Group"),
158
169
  React.createElement(ValueChangedIcon, { afterLocalChange: afterGroupLocalChange, comparator: groupComparator, isLocalChange: localGroupChange, value: selectedCaseGroup, getTooltipContent: getChangedValueTooltip(() => CaseValuesToWatch.group, (v) => v.name) }),
159
170
  isGroupMandatory && (React.createElement("span", { className: "form-required", "aria-hidden": true }, "*"))),
160
- React.createElement(Dropdown, { id: "get-support-group", searchable: (ownersCaseGroups.data || []).length > 10, onClearSelection: onCaseGroupClear, name: "get-support-group", placeholder: t(`Select a group`), title: t(`Select a group`), list: computeDropdownList(), selectedItem: toOption(selectedCaseGroup, { labelKey: 'name' }), disabled: ownersCaseGroups.isError || ownersCaseGroups.isFetching || isCaseGroupUpdating, isLoadingList: ownersCaseGroups.isFetching || isCaseGroupUpdating, onChange: onCaseGroupChange, isInValid: (ownersCaseGroups.isError || isCaseGroupInvalid || isSelectedUngroupedInvalid) && isGroupMandatory, required: isGroupMandatory, onOuterClick: onOuterClickGroupCheck, "data-tracking-id": "get-support-group" }),
161
- isSelectedUngroupedInvalid && (React.createElement("p", { className: "form-instructions form-invalid" },
171
+ React.createElement(Dropdown, { id: "get-support-group", searchable: (ownersCaseGroups.data || []).length > 10, onClearSelection: onCaseGroupClear, name: "get-support-group", placeholder: t(`Select a group`), title: t(`Select a group`), list: computeDropdownList(), selectedItem: toOption(selectedCaseGroup, { labelKey: 'name' }), disabled: ownersCaseGroups.isError || ownersCaseGroups.isFetching || isCaseGroupUpdating, isLoadingList: ownersCaseGroups.isFetching || isCaseGroupUpdating, onChange: onCaseGroupChange, isInValid: ownersCaseGroups.isError || showEmptyValidationError || (caseNumber && isSelectedUngroupedInvalid), required: isGroupMandatory, onOuterClick: onOuterClickGroupCheck, "data-tracking-id": "get-support-group" }),
172
+ caseNumber && isSelectedUngroupedInvalid && (React.createElement("p", { className: "form-instructions form-invalid" },
162
173
  React.createElement(Trans, null, "'Ungrouped Case' cannot be selected. Please select a group."))),
163
- isCaseGroupInvalid && isGroupMandatory && (React.createElement("p", { className: "form-instructions form-invalid" },
174
+ showEmptyValidationError && isGroupMandatory && (React.createElement("p", { className: "form-instructions form-invalid" },
164
175
  React.createElement(Trans, null, "Case group cannot be empty."))),
165
176
  showHelperText && (React.createElement("p", { className: "form-instructions" },
166
177
  React.createElement(Trans, null, "Organization administrators have the permission to manage groups.")))));
@@ -1 +1 @@
1
- {"version":3,"file":"OpenShiftClusterId.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenShiftClusterId.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,mBAUxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,mBAIjC,CAAC;AAEF,wBAAgB,kBAAkB,gBAkRjC"}
1
+ {"version":3,"file":"OpenShiftClusterId.d.ts","sourceRoot":"","sources":["../../../../src/components/CaseManagement/OpenShiftClusterId.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,oBAAoB,mBAShC,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAInC,CAAC;AAEF,eAAO,MAAM,4BAA4B,mBAUxC,CAAC;AAEF,eAAO,MAAM,qBAAqB,mBAIjC,CAAC;AAEF,wBAAgB,kBAAkB,gBAyRjC"}
@@ -120,6 +120,8 @@ export function OpenShiftClusterId() {
120
120
  // context api state will be reset on parent component each time user changes product and version
121
121
  useEffect(() => {
122
122
  clusterStateReset();
123
+ v3ClusterNameInputBoxChanged(v3ClusterName);
124
+ // eslint-disable-next-line react-hooks/exhaustive-deps
123
125
  }, [product, version]);
124
126
  /**
125
127
  * Hook to set clusterId fields when comes from session or backward/forward
@@ -191,8 +193,10 @@ export function OpenShiftClusterId() {
191
193
  }
192
194
  };
193
195
  const v3ClusterNameInputBoxChanged = (v3Cluster) => {
194
- const v3ClusterName = isEmpty(v3Cluster.trim()) ? '' : v3Cluster;
195
- const description = getUpdatedDescription(issue, environment, periodicityOfIssue, timeFramesAndUrgency, v3ClusterName);
196
+ const v3ClusterName = product === 'OpenShift Container Platform' && version !== '3.11' && isEmpty(v3Cluster.trim())
197
+ ? ''
198
+ : v3Cluster;
199
+ const description = getUpdatedDescription(issue, environment, periodicityOfIssue, timeFramesAndUrgency, v3ClusterName, product, version);
196
200
  setCaseState(caseDispatch, { v3ClusterName });
197
201
  setCaseDetails(caseDispatch, { description });
198
202
  };
@@ -1 +1 @@
1
- {"version":3,"file":"GlobalTroubleshootEffects.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/GlobalTroubleshootEffects.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAcrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,eAoatD"}
1
+ {"version":3,"file":"GlobalTroubleshootEffects.d.ts","sourceRoot":"","sources":["../../../../src/components/wizardLayout/GlobalTroubleshootEffects.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAqB,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAcrF,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,eA0atD"}
@@ -331,6 +331,7 @@ export function GlobalTroubleshootEffects(props) {
331
331
  // Need to check `hasCluster` is empty as when product is changing from shift product to non-shift
332
332
  // product new product will don't have any cluster
333
333
  const isClusterInfoShouldBeReset = !hasCluster || (hasCluster && oldMajorVersion !== newMajorVersion);
334
+ const isOpenShiftV3 = product === 'OpenShift Container Platform' && newMajorVersion === '3';
334
335
  if (isClusterInfoShouldBeReset) {
335
336
  setCaseDetails(caseDispatch, {
336
337
  openshiftClusterID: '',
@@ -340,6 +341,9 @@ export function GlobalTroubleshootEffects(props) {
340
341
  });
341
342
  setCaseState(caseDispatch, { v3ClusterName: '' });
342
343
  }
344
+ if (!isOpenShiftV3) {
345
+ setCaseState(caseDispatch, { v3ClusterName: '' });
346
+ }
343
347
  // eslint-disable-next-line react-hooks/exhaustive-deps
344
348
  }, [product, version, allProducts.data.productsResult, caseDispatch]);
345
349
  return React.createElement(React.Fragment, null);
@@ -8,7 +8,7 @@ import { ICaseState } from './CaseConstNTypes';
8
8
  export declare const getCaseRecommendations: (docs: ISolrRecommendation[], oldDocs: any) => any[];
9
9
  export declare const getCepCommentFromCepDetails: (cepDetails: ICepDetails) => string;
10
10
  export declare const getRecommendationObject: (doc: ISolrRecommendation, index: number) => ICaseResourceLink;
11
- export declare const getUpdatedDescription: (issue: string, environment?: string, periodicityOfIssue?: string, timeFramesAndUrgency?: string, v3ClusterName?: string) => string;
11
+ export declare const getUpdatedDescription: (issue: string, environment?: string, periodicityOfIssue?: string, timeFramesAndUrgency?: string, v3ClusterName?: string, product?: string, version?: string) => string;
12
12
  export declare const getDescriptionWOQues: (issue: string, environment?: string, periodicityOfIssue?: string, timeFramesAndUrgency?: string) => string;
13
13
  export declare const getIrtForSLAAndSeverity: (slaProcessId: string, severity: string) => string;
14
14
  export declare const getOrtForSLAAndSeverity: (slaProcessId: string, severity: string) => string;
@@ -1 +1 @@
1
- {"version":3,"file":"CaseHelpers.d.ts","sourceRoot":"","sources":["../../../src/reducers/CaseHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAkB3D,OAAO,EAUH,UAAU,EAgBb,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,sBAAsB,SAAU,mBAAmB,EAAE,wBAMjE,CAAC;AAEF,eAAO,MAAM,2BAA2B,eAAgB,WAAW,KAAG,MAOrE,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAS,mBAAmB,SAAS,MAAM,sBAyB9E,CAAC;AAIF,eAAO,MAAM,qBAAqB,UACvB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,kBACb,MAAM,KACvB,MAuBF,CAAC;AAIF,eAAO,MAAM,oBAAoB,UACtB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,KAC9B,MAQF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAc,MAAM,KAAG,MAKzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,+CAqC5B,CAAC;AAIF,eAAO,MAAM,gBAAgB,cAAe,UAAU,wBAAwB,QAAQ,eAAe,CAAC,KAAG,OA6BxG,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAClB,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAyBF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cACxB,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAiBF,CAAC;AAIF,eAAO,MAAM,6BAA6B,cAC3B,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAuBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,cACf,UAAU,gBACP,YAAY,iBACZ,OAAO,KACtB,QAAQ,YAAY,CAuEtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,qBAAsB,YAAY,EAAE,KAAG,YAAY,EAEvF,CAAC;AACF,eAAO,MAAM,yBAAyB,qBAAsB,YAAY,EAAE,KAAG,OAE5E,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBACrB,YAAY,6BACE,MAAM,mBAChB,MAAM,KACxB,QAAQ,YAAY,CA+BtB,CAAC;AACF,eAAO,MAAM,yBAAyB,gBACrB,QAAQ,YAAY,CAAC,gCACJ,QAAQ,EAAE,KACzC,eA2CF,CAAC"}
1
+ {"version":3,"file":"CaseHelpers.d.ts","sourceRoot":"","sources":["../../../src/reducers/CaseHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAkB3D,OAAO,EAUH,UAAU,EAgBb,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,sBAAsB,SAAU,mBAAmB,EAAE,wBAMjE,CAAC;AAEF,eAAO,MAAM,2BAA2B,eAAgB,WAAW,KAAG,MAOrE,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAS,mBAAmB,SAAS,MAAM,sBAyB9E,CAAC;AAIF,eAAO,MAAM,qBAAqB,UACvB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,kBACb,MAAM,YACZ,MAAM,YACN,MAAM,KACjB,MAyBF,CAAC;AAIF,eAAO,MAAM,oBAAoB,UACtB,MAAM,gBACC,MAAM,uBACC,MAAM,yBACJ,MAAM,KAC9B,MAQF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,uBAAuB,iBAAkB,MAAM,YAAY,MAAM,KAAG,MAQhF,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAc,MAAM,KAAG,MAKzD,CAAC;AAEF,eAAO,MAAM,gBAAgB,+CAqC5B,CAAC;AAIF,eAAO,MAAM,gBAAgB,cAAe,UAAU,wBAAwB,QAAQ,eAAe,CAAC,KAAG,OA6BxG,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAClB,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAyBF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cACxB,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAiBF,CAAC;AAIF,eAAO,MAAM,6BAA6B,cAC3B,UAAU,wBACC,QAAQ,eAAe,CAAC,KAC/C,OAuBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,cACf,UAAU,gBACP,YAAY,iBACZ,OAAO,KACtB,QAAQ,YAAY,CAuEtB,CAAC;AAEF,eAAO,MAAM,wBAAwB,qBAAsB,YAAY,EAAE,KAAG,YAAY,EAEvF,CAAC;AACF,eAAO,MAAM,yBAAyB,qBAAsB,YAAY,EAAE,KAAG,OAE5E,CAAC;AAEF,eAAO,MAAM,yBAAyB,gBACrB,YAAY,6BACE,MAAM,mBAChB,MAAM,KACxB,QAAQ,YAAY,CA+BtB,CAAC;AACF,eAAO,MAAM,yBAAyB,gBACrB,QAAQ,YAAY,CAAC,gCACJ,QAAQ,EAAE,KACzC,eA2CF,CAAC"}
@@ -45,19 +45,20 @@ export const getRecommendationObject = (doc, index) => {
45
45
  return rec;
46
46
  };
47
47
  // Responsible for the order of the questions in which they appear on case details
48
- export const getUpdatedDescription = (issue, environment, periodicityOfIssue, timeFramesAndUrgency, v3ClusterName) => {
48
+ export const getUpdatedDescription = (issue, environment, periodicityOfIssue, timeFramesAndUrgency, v3ClusterName, product, version) => {
49
49
  let description = issue;
50
+ const v3ClusterNameFinal = product === 'OpenShift Container Platform' && version !== '3.11' ? '' : v3ClusterName;
50
51
  if (!isEmpty(environment) ||
51
52
  !isEmpty(periodicityOfIssue) ||
52
53
  !isEmpty(timeFramesAndUrgency) ||
53
- !isEmpty(v3ClusterName)) {
54
+ !isEmpty(v3ClusterNameFinal)) {
54
55
  description = `${KtQuestionConstant.issue}\n${issue}`;
55
56
  description += !isEmpty(timeFramesAndUrgency)
56
57
  ? `\n\n${KtQuestionConstant.timeFramesAndUrgency}\n${timeFramesAndUrgency}`
57
58
  : '';
58
59
  description +=
59
- !isEmpty(environment) || !isEmpty(v3ClusterName)
60
- ? `\n\n${KtQuestionConstant.environment}\n${v3ClusterName ? `OpenShift Cluster Name: ${v3ClusterName} \n` : ''}${environment}`
60
+ !isEmpty(environment) || !isEmpty(v3ClusterNameFinal)
61
+ ? `\n\n${KtQuestionConstant.environment}\n${v3ClusterNameFinal ? `OpenShift Cluster Name: ${v3ClusterNameFinal} \n` : ''}${environment}`
61
62
  : '';
62
63
  description += !isEmpty(periodicityOfIssue)
63
64
  ? `\n\n${KtQuestionConstant.periodicityOfIssue}\n${periodicityOfIssue}`
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rh-support/troubleshoot",
3
- "version": "2.0.1",
3
+ "version": "2.0.2-beta.0",
4
4
  "publishConfig": {
5
5
  "access": "public",
6
6
  "registry": "https://registry.npmjs.org"
@@ -26,7 +26,7 @@
26
26
  "lib/**/*"
27
27
  ],
28
28
  "peerDependencies": {
29
- "@cee-eng/hydrajs": "4.15.71",
29
+ "@cee-eng/hydrajs": "4.15.72",
30
30
  "@cee-eng/ui-toolkit": "1.1.6",
31
31
  "@patternfly/patternfly": "4.196.7",
32
32
  "@patternfly/pfe-accordion": "1.12.3",
@@ -63,7 +63,7 @@
63
63
  "react-virtualized": "^9.21.2"
64
64
  },
65
65
  "dependencies": {
66
- "@cee-eng/hydrajs": "4.15.71",
66
+ "@cee-eng/hydrajs": "4.15.72",
67
67
  "@cee-eng/ui-toolkit": "1.1.6",
68
68
  "@patternfly/patternfly": "4.196.7",
69
69
  "@patternfly/pfe-accordion": "1.12.3",
@@ -73,11 +73,11 @@
73
73
  "@patternfly/react-core": "4.264.0",
74
74
  "@progress/kendo-drawing": "^1.6.0",
75
75
  "@progress/kendo-react-pdf": "^3.12.0",
76
- "@rh-support/components": "2.0.1",
77
- "@rh-support/react-context": "2.0.1",
76
+ "@rh-support/components": "2.0.2-beta.0",
77
+ "@rh-support/react-context": "2.0.2-beta.0",
78
78
  "@rh-support/types": "2.0.1",
79
- "@rh-support/user-permissions": "2.0.1",
80
- "@rh-support/utils": "2.0.1",
79
+ "@rh-support/user-permissions": "2.0.1-beta.0",
80
+ "@rh-support/utils": "2.0.1-beta.0",
81
81
  "@types/react-redux": "^7.1.12",
82
82
  "@types/redux": "^3.6.0",
83
83
  "@webcomponents/webcomponentsjs": "^2.2.10",
@@ -145,5 +145,5 @@
145
145
  "not ie <= 11",
146
146
  "not op_mini all"
147
147
  ],
148
- "gitHead": "98c698c7f5ca8e1ec943598ef96a6fb816babc1e"
148
+ "gitHead": "d8aaf95219bd66267ccfeef0d708d88dadc60766"
149
149
  }