From c7b6e05f060bdba70d9a1ce0a03004b893a68e5e Mon Sep 17 00:00:00 2001 From: Alexander <98586297+Alexander-Kezik@users.noreply.github.com> Date: Mon, 26 Aug 2024 11:06:05 +0200 Subject: [PATCH] fix(chat): fix prompt applying for admin (Issue #1967) (#1968) --- .../components/Chat/ChatInput/PromptList.tsx | 5 ++-- .../publication/publication.selectors.ts | 26 ++++++++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/apps/chat/src/components/Chat/ChatInput/PromptList.tsx b/apps/chat/src/components/Chat/ChatInput/PromptList.tsx index e61d4f3e50..98c7e11ea4 100644 --- a/apps/chat/src/components/Chat/ChatInput/PromptList.tsx +++ b/apps/chat/src/components/Chat/ChatInput/PromptList.tsx @@ -33,10 +33,9 @@ export const PromptList: FC = ({ }, }); const promptResources = useAppSelector((state) => - PublicationSelectors.selectFilteredPublicationResources( - state, + PublicationSelectors.selectFilteredPublicationResources(state, [ FeatureType.Prompt, - ), + ]), ); const dismiss = useDismiss(context); diff --git a/apps/chat/src/store/publication/publication.selectors.ts b/apps/chat/src/store/publication/publication.selectors.ts index 81fd9eb1ae..f95bf8552d 100644 --- a/apps/chat/src/store/publication/publication.selectors.ts +++ b/apps/chat/src/store/publication/publication.selectors.ts @@ -25,22 +25,25 @@ export const selectPublications = createSelector([rootSelector], (state) => { export const selectFilteredPublications = createSelector( [ - rootSelector, + selectPublications, (_state, featureTypes: FeatureType[]) => featureTypes, - (_state, _featureTypes, includeEmptyResourceTypes?: boolean) => - includeEmptyResourceTypes, + ( + _state, + _featureTypes: FeatureType[], + includeEmptyResourceTypes?: boolean, + ) => includeEmptyResourceTypes, ], - (state, featureTypes, includeEmptyResourceTypes) => { - return state.publications.filter( - (p) => - p.resourceTypes.some((resourceType) => + (publications, featureTypes, includeEmptyResourceTypes) => { + return publications.filter( + (publication) => + publication.resourceTypes.some((resourceType) => featureTypes .map((featureType) => EnumMapper.getBackendResourceTypeByFeatureType(featureType), ) .includes(resourceType), ) || - (includeEmptyResourceTypes && !p.resourceTypes.length), + (includeEmptyResourceTypes && !publication.resourceTypes.length), ); }, ); @@ -185,8 +188,11 @@ export const selectPublicationsToReviewCount = createSelector( selectPublications, selectResourcesToReview, (_state, featureTypes: FeatureType[]) => featureTypes, - (_state, _featureTypes, includeEmptyFeatureTypes?: boolean) => - includeEmptyFeatureTypes, + ( + _state, + _featureTypes: FeatureType[], + includeEmptyFeatureTypes?: boolean, + ) => includeEmptyFeatureTypes, ], (publications, resourcesToReview, featureTypes, includeEmptyFeatureTypes) => { const filteredPublications = publications.filter(