Skip to content

Commit

Permalink
fix(chat): add models models and files uploading if approved request …
Browse files Browse the repository at this point in the history
…has such resources (Issue #2048) (#3030)
  • Loading branch information
Alexander-Kezik authored Jan 29, 2025
1 parent 7571b46 commit ca0f6ea
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 13 deletions.
47 changes: 35 additions & 12 deletions apps/chat/src/store/publication/publication.epics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -598,10 +598,10 @@ const uploadPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
const selectedIds =
ConversationsSelectors.selectSelectedConversationsIds(state$.value);

const selectedConversationsToUpload = selectedIds
const selectedConversationsToUpload = selectedIds.filter(
// do not upload root entities, as they uploaded with listing
.filter((id) => id.split('/').length > 3)
.filter((id) => isEntityIdPublic({ id }));
(id) => id.split('/').length > 3 && isEntityIdPublic({ id }),
);
const publicationItems = items.map((item) => ({
...item,
id: item.url,
Expand Down Expand Up @@ -664,8 +664,6 @@ const uploadPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
publicVersionGroups,
}),
),
);
actions.push(
of(
ConversationsActions.addConversations({
conversations,
Expand Down Expand Up @@ -703,8 +701,6 @@ const uploadPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
publicVersionGroups,
}),
),
);
actions.push(
of(
PromptsActions.addPrompts({
prompts,
Expand Down Expand Up @@ -1104,6 +1100,12 @@ const approvePublicationEpic: AppEpic = (action$, state$) =>
of(
PublicationActions.approvePublicationSuccess({
url: payload.url,
triggerModelsListing: selectedPublication.resources.some(
(resource) => isApplicationId(resource.reviewUrl),
),
triggerPublicFilesListing: selectedPublication.resources.some(
(resource) => isFileId(resource.reviewUrl),
),
}),
),
);
Expand Down Expand Up @@ -1152,6 +1154,30 @@ const rejectPublicationFailEpic: AppEpic = (action$) =>
),
);

const approvePublicationSuccessEpic: AppEpic = (action$) =>
action$.pipe(
filter(PublicationActions.approvePublicationSuccess.match),
switchMap(({ payload }) => {
const actions: Observable<AnyAction>[] = [];

if (payload.triggerModelsListing) {
actions.push(of(ModelsActions.getModels()));
}

if (payload.triggerPublicFilesListing) {
actions.push(
of(
PublicationActions.uploadPublishedWithMeItems({
featureType: FeatureType.File,
}),
),
);
}

return concat(...actions);
}),
);

const resolvePublicationSuccessEpic: AppEpic = (action$, state$) =>
action$.pipe(
filter(
Expand Down Expand Up @@ -1286,8 +1312,6 @@ const uploadAllPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
publicVersionGroups,
}),
),
);
actions.push(
of(
ConversationsActions.uploadChildConversationsWithFoldersSuccess(
{
Expand All @@ -1311,8 +1335,6 @@ const uploadAllPublishedWithMeItemsEpic: AppEpic = (action$, state$) =>
publicVersionGroups,
}),
),
);
actions.push(
of(
PromptsActions.uploadChildPromptsWithFoldersSuccess({
parentIds: paths,
Expand Down Expand Up @@ -1370,11 +1392,12 @@ export const PublicationEpics = combineEpics(
uploadAllPublishedWithMeItemsEpic,
uploadAllPublishedWithMeItemsFailEpic,

// handle publications
// resolve publications
approvePublicationEpic,
approvePublicationFailEpic,
rejectPublicationEpic,
rejectPublicationFailEpic,
approvePublicationSuccessEpic,
resolvePublicationSuccessEpic,

// upload rules
Expand Down
8 changes: 7 additions & 1 deletion apps/chat/src/store/publication/publication.reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,13 @@ export const publicationSlice = createSlice({
state,
approvePublicationSuccess: (
state,
{ payload }: PayloadAction<{ url: string }>,
{
payload,
}: PayloadAction<{
url: string;
triggerModelsListing: boolean;
triggerPublicFilesListing: boolean;
}>,
) => {
state.publications = state.publications.filter(
(p) => p.url !== payload.url,
Expand Down

0 comments on commit ca0f6ea

Please sign in to comment.