@rh-support/cases 0.2.28 → 0.2.32

package/lib/esm/components/case-list/CaseList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AA4BlC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,0BAA0B,EAI7B,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAK1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AA4B3F,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC3D,YAAY,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,oBAAY,YAAY,GAAG,0BAA0B,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAM5F,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,eAucrC"}
+{"version":3,"file":"CaseList.d.ts","sourceRoot":"","sources":["../../../../src/components/case-list/CaseList.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAChC,OAAO,0BAA0B,CAAC;AA4BlC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAKH,0BAA0B,EAI7B,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAK1C,OAAO,EAAgB,WAAW,EAA2B,MAAM,uBAAuB,CAAC;AA4B3F,UAAU,MAAM;IACZ,UAAU,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC3D,YAAY,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,oBAAY,YAAY,GAAG,0BAA0B,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAM5F,MAAM,WAAW,gBAAgB;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,eAidrC"}

package/lib/esm/components/case-list/CaseList.js

@@ -37,7 +37,7 @@ import { CaseSearch } from './case-search/CaseSearch';
 import { useCaseListDispatchContext, useCaseListStateContext } from './CaseListContext';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from './CaseListFilterContext';
 import { isNoFilterApplied, isOnlyDefaultFilterApplied } from './CaseListFilterHelpers';
-import { updateFilterState } from './CaseListFilterReducer';
+import { initialFilterInfo, updateFilterState } from './CaseListFilterReducer';
 import { setCaseList, setCurrentQuery, setFilterValuesFromFacetResponse, setIsFetching, setPivotValues, } from './CaseListReducer';
 export function CaseList(props) {
     var _a, _b;
@@ -81,7 +81,11 @@ export function CaseList(props) {
                 // recreate a new AbortController for each call
                 let controller = new AbortController();
                 abortControllerRef.current = controller;
-                const { caseListResponse, isSolrSearchDownSFDCUp, showErrorMessage } = yield getCaseList(currentFilterState, loggedInUserRights.data, loggedInUsersAccount.data, controller.signal);
+                const { caseListResponse, isSolrSearchDownSFDCUp, showErrorMessage, resetFilters } = yield getCaseList(currentFilterState, loggedInUserRights.data, loggedInUsersAccount.data, controller.signal);
+                if (resetFilters) {
+                    updateFilterState(filterDispatch, Object.assign(Object.assign({}, filterState), { filterInfo: Object.assign({}, initialFilterInfo) }));
+                    return;
+                }
                 showError = showErrorMessage;
                 setSolrSearchDown(isSolrSearchDownSFDCUp);
                 setFilterValuesFromFacetResponse(CaseListDispatch, solrResponseToFacetFields(caseListResponse));
@@ -130,7 +134,11 @@ export function CaseList(props) {
     };
     const checkNewCases = () => __awaiter(this, void 0, void 0, function* () {
         try {
-            const { caseListResponse, isSolrSearchDownSFDCUp } = yield getCaseList(filterState, loggedInUserRights.data, loggedInUsersAccount.data, null);
+            const { caseListResponse, isSolrSearchDownSFDCUp, resetFilters } = yield getCaseList(filterState, loggedInUserRights.data, loggedInUsersAccount.data, null);
+            if (resetFilters) {
+                updateFilterState(filterDispatch, Object.assign(Object.assign({}, filterState), { filterInfo: Object.assign({}, initialFilterInfo) }));
+                return;
+            }
             setSolrSearchDown(isSolrSearchDownSFDCUp);
             let changed = false;
             if (caseListResponse.response.numFound <= filterState.paginationInfo.pageSize &&
@@ -151,7 +159,7 @@ export function CaseList(props) {
                     }
                 });
             }
-            if (changed) {
+            if (changed && location.pathname === '/case/list') {
                 setCaseList(CaseListDispatch, caseListResponse.response);
                 pendoTrackEvent(UpdatedCaseDataEvent);
                 ToastNotification.addSuccessMessage(t('Case data has been updated'));

package/lib/esm/components/case-list/case-list-filters/CaseListFilters.js

@@ -29,12 +29,12 @@ export const CaseListFilters = ({ filterValues, allCaseTypes, allCaseSeverities,
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { className: "filter-group" },
             !isSolrSearchDown && canReadBookmarkAccounts && (React.createElement(AccountsFilter, { canReadBookmarkAccounts: canReadBookmarkAccounts })),
-            (canReadBookmarkAccounts || canAccessManagedAccounts) && (React.createElement(AccountsFilterWrapper, { canManageBookmarkAccounts: canManageBookmarkAccounts, canReadBookmarkAccounts: canReadBookmarkAccounts, canAccessManagedAccounts: canAccessManagedAccounts })),
+            !isSolrSearchDown && (canReadBookmarkAccounts || canAccessManagedAccounts) && (React.createElement(AccountsFilterWrapper, { canManageBookmarkAccounts: canManageBookmarkAccounts, canReadBookmarkAccounts: canReadBookmarkAccounts, canAccessManagedAccounts: canAccessManagedAccounts })),
             canAccessGroupsFilter && React.createElement(GroupsFilter, null),
             canAccessProductsFilter && (React.createElement(ProductsFilter, { filterValues: get(filterValues, SolrKeys.product, []), isSolrSearchDown: isSolrSearchDown, allProducts: ((_a = allProducts.data) === null || _a === void 0 ? void 0 : _a.productsResult.map((p) => p.product)) || [] })),
             canAccessSeverityFilter && (React.createElement(SeverityFilter, { filterValues: get(filterValues, SolrKeys.severity, []), isSolrSearchDown: isSolrSearchDown, allCaseSeverities: allCaseSeverities.data })),
             canAccessStatusFilter && (React.createElement(StatusFilter, { filterValues: get(filterValues, SolrKeys.status, []), allCaseStatuses: allCaseStatuses.data, isSolrSearchDown: isSolrSearchDown })),
-            canAccessCreatorFilter && React.createElement(CreatorSsoNameFilter, null),
+            !isSolrSearchDown && canAccessCreatorFilter && React.createElement(CreatorSsoNameFilter, null),
             !isSolrSearchDown && canAccessTypeFilter && React.createElement(TypeFilter, { allCaseTypes: allCaseTypes.data }),
             !isSolrSearchDown && canAccessAdditionalFilter && React.createElement(AdditionalFilters, null))));
 };

package/lib/esm/components/case-list/case-list-filters/TypeFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/TypeFilter.tsx"],"names":[],"mappings":"AAUA,UAAU,MAAM;IACZ,YAAY,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,eA6BvC"}
+{"version":3,"file":"TypeFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/TypeFilter.tsx"],"names":[],"mappings":"AAWA,UAAU,MAAM;IACZ,YAAY,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,eA6CvC"}

package/lib/esm/components/case-list/case-list-filters/TypeFilter.js

@@ -1,7 +1,8 @@
 import { MultiSelectDropDownList } from '@rh-support/components';
+import { FeatureAnnouncementKeys, NewFeatureLabel } from '@rh-support/react-context';
 import { getDropdownBtnPlaceholder, toOptions } from '@rh-support/utils';
 import React, { useContext } from 'react';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 import { SolrKeys } from '../../../enums/filters';
 import { filterNamesMap } from '../../../utils/constants';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
@@ -14,5 +15,8 @@ export function TypeFilter(props) {
         filterKey: SolrKeys.type,
         values: selectedTypes.map((selectedType) => selectedType.label),
     });
-    return (React.createElement(MultiSelectDropDownList, { placeholder: getDropdownBtnPlaceholder(t('Select a type'), filterInfo[SolrKeys.type], ' ', props.allCaseTypes.length, t('All selected')), "data-tracking-id": "type-filter", id: "case-list-type-filter", title: t(filterNamesMap[SolrKeys.type]), label: t(filterNamesMap[SolrKeys.type]), onChange: onFilterChangeMultipleSelect, selectedItems: toOptions(filterInfo[SolrKeys.type]), list: toOptions(props.allCaseTypes) }));
+    return (React.createElement(MultiSelectDropDownList, { placeholder: getDropdownBtnPlaceholder(t('Select a case type'), filterInfo[SolrKeys.type], ' ', props.allCaseTypes.length, t('All selected')), "data-tracking-id": "type-filter", id: "case-list-type-filter", title: t(filterNamesMap[SolrKeys.type]), label: React.createElement("h3", { className: "pull-bottom-narrow" },
+            t(filterNamesMap[SolrKeys.type]),
+            React.createElement(NewFeatureLabel, { "aria-label": "send notification new feature announcement", hasAutoWidth: true, featureName: FeatureAnnouncementKeys.CASE_TYPE_FILTER, headerContent: React.createElement(Trans, null, "New filter available"), position: 'right', bodyContent: React.createElement("div", null,
+                    React.createElement(Trans, null, "You can now filter by case type.")) })), onChange: onFilterChangeMultipleSelect, selectedItems: toOptions(filterInfo[SolrKeys.type]), list: toOptions(props.allCaseTypes) }));
 }

package/lib/esm/components/case-list/case-list-table/CaseListTable.js

@@ -155,7 +155,7 @@ export function CaseListTable(props) {
         {
             id: CaseListColumnIds.type,
             cellWidth: 10,
-            title: t('Type'),
+            title: t('Case type'),
             sortable: true,
             accessor: (data) => data.case_type,
             show: isColumnVisible(CaseListColumnIds.type),

package/lib/esm/components/case-list/case-list-table/ExportCaseListCSV.js

@@ -52,7 +52,7 @@ const csvHeadersSFDC = [
     { label: 'Modified date', key: SFDCKeys.lastPublicUpdateDate, transform: formatDateTime },
     { label: 'Uri', key: SFDCKeys.uri },
     { label: 'Alternate case ID', key: SFDCKeys.alternateId },
-    { label: 'Type', key: SFDCKeys.caseType },
+    { label: 'Case type', key: SFDCKeys.caseType },
 ];
 const groupHeaderSOLR = { label: 'Group', key: SolrKeys.groupName };
 const groupHeaderSFDC = { label: 'Group', key: SFDCKeys.groupName };

package/lib/esm/utils/caseListUtils.d.ts

@@ -12,6 +12,7 @@ interface ICaseListResponse {
     caseListResponse: ISolrCaseSearchResponse;
     isSolrSearchDownSFDCUp: boolean;
     showErrorMessage: boolean;
+    resetFilters: boolean;
 }
 export declare function getCaseList(filterState: ICaseListFilterState, loggedInUser: UserAuth, loggedInUserAccount: Partial<IAccount>, abortSignal: AbortSignal, forceSfdcSearch?: boolean): Promise<ICaseListResponse>;
 export declare function getCaseListFromSolr(solrQuery: ISearchSolrQuery, partnerSearch: boolean, abortSignal: AbortSignal, isSecureSupport?: boolean): Promise<ISolrCaseSearchResponse>;

package/lib/esm/utils/caseListUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caseListUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAuC,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAOlG,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC;IACjC,CAAC,CAAC,EAAE,KAAK,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAiBD,wBAAsB,WAAW,CAC7B,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,eAAe,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAmF5B;AAED,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,GAAE,OAAe,GACjC,OAAO,CAAC,uBAAuB,CAAC,CASlC"}
+{"version":3,"file":"caseListUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/caseListUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAuC,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAOlG,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC;IACjC,CAAC,CAAC,EAAE,KAAK,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,sBAAsB,EAAE,OAAO,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;CACzB;AAiBD,wBAAsB,WAAW,CAC7B,WAAW,EAAE,oBAAoB,EACjC,YAAY,EAAE,QAAQ,EACtB,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,eAAe,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAyE5B;AAED,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,OAAO,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,GAAE,OAAe,GACjC,OAAO,CAAC,uBAAuB,CAAC,CASlC"}

package/lib/esm/utils/caseListUtils.js

@@ -37,10 +37,11 @@ const throwErrorOnAbort = (message) => {
 // Even though SFDC support most of the filters but another problem with SFDC is it doesnot support multiple values for a praticular filter.
 // if user applies any filter apart from default filter we will always call solr and assume that(not safely) 10 sec scenario is not bound to happen.
 export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abortSignal, forceSfdcSearch) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     return __awaiter(this, void 0, void 0, function* () {
         let isSolrSearchDownSFDCUp = false;
         let showErrorMessage = false;
+        let resetFilters = false;
         let caseListResponse;
         const solrFilter = createSolrQueryFromFilterState(filterState, loggedInUser);
         const partnerSearch = loggedInUser.hasManagedAccounts() && ((_b = (_a = filterState.filterInfo) === null || _a === void 0 ? void 0 : _a.case_accountNumber) !== null && _b !== void 0 ? _b : []).length > 0;
@@ -62,25 +63,12 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             showErrorMessage = true;
         }
         else if (!solrFullfilled && sfdcCallNotMade) {
-            const sfdcRes = yield promiseReflection(sfdcAPICall());
-            sfdcFullfilled = !!(sfdcRes.status === 'fulfilled' && ((_e = sfdcRes.v) === null || _e === void 0 ? void 0 : _e.cases));
-            if (sfdcFullfilled) {
-                isSolrSearchDownSFDCUp = true;
-                const mappedSfdcRes = mapSFDCCaseListToSolrCaseList((_g = (_f = sfdcRes === null || sfdcRes === void 0 ? void 0 : sfdcRes.v) === null || _f === void 0 ? void 0 : _f.cases) !== null && _g !== void 0 ? _g : []);
-                caseListResponse = {
-                    response: {
-                        docs: mappedSfdcRes,
-                        numFound: sfdcRes.v.totalCount,
-                    },
-                };
-            }
-            else {
-                showErrorMessage = true;
-            }
+            // SFDC call didn't make because we had filters that SFDC doesn't support
+            resetFilters = true;
         }
         else if (solrFullfilled && sfdcFullfilled) {
             caseListResponse = Object.assign(Object.assign({}, solrResponse.v), { response: {
-                    docs: mapSFDCCaseListToSolrCaseList((_j = (_h = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _h === void 0 ? void 0 : _h.cases) !== null && _j !== void 0 ? _j : []),
+                    docs: mapSFDCCaseListToSolrCaseList((_f = (_e = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _e === void 0 ? void 0 : _e.cases) !== null && _f !== void 0 ? _f : []),
                     numFound: sfdcResponse.v.totalCount,
                 } });
         }
@@ -88,7 +76,7 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             isSolrSearchDownSFDCUp = true;
             caseListResponse = {
                 response: {
-                    docs: mapSFDCCaseListToSolrCaseList((_l = (_k = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _k === void 0 ? void 0 : _k.cases) !== null && _l !== void 0 ? _l : []),
+                    docs: mapSFDCCaseListToSolrCaseList((_h = (_g = sfdcResponse === null || sfdcResponse === void 0 ? void 0 : sfdcResponse.v) === null || _g === void 0 ? void 0 : _g.cases) !== null && _h !== void 0 ? _h : []),
                     numFound: sfdcResponse.v.totalCount,
                 },
             };
@@ -100,6 +88,7 @@ export function getCaseList(filterState, loggedInUser, loggedInUserAccount, abor
             caseListResponse,
             isSolrSearchDownSFDCUp,
             showErrorMessage,
+            resetFilters,
         };
     });
 }

package/lib/esm/utils/constants.js

@@ -17,7 +17,7 @@ export const filterNamesMap = {
     [SolrKeys.caseNumber]: 'Case number',
     [SolrKeys.createdBySsoUsername]: 'Created by me',
     [SolrKeys.caseContactSSO]: 'Owned by me',
-    [SolrKeys.type]: 'Type',
+    [SolrKeys.type]: 'Case type',
     usernameFilterTitle: 'Username',
 };
 export const UpdatedCaseDataEvent = 'PCM-Next > case-list-data-background-refresh';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "0.2.28",
+    "version": "0.2.32",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -53,11 +53,11 @@
         "@patternfly/react-core": "4.128.2",
         "@patternfly/react-table": "4.26.7",
         "@rh-support/api": "0.3.9",
-        "@rh-support/components": "1.1.21",
-        "@rh-support/react-context": "0.2.23",
+        "@rh-support/components": "1.1.23",
+        "@rh-support/react-context": "0.2.26",
         "@rh-support/types": "0.2.0",
-        "@rh-support/user-permissions": "0.2.16",
-        "@rh-support/utils": "0.2.14",
+        "@rh-support/user-permissions": "0.2.17",
+        "@rh-support/utils": "0.2.15",
         "i18next": "^19.0.1",
         "localforage": "^1.7.3",
         "lodash": "^4.17.15",
@@ -101,5 +101,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "f16c3e016d3cfc56fa94f1cb1a8f8ab2d3fe0a35"
+    "gitHead": "89ef7aa11c6152e04055c8869184e1e146ebea99"
 }