import { ProjectResource } from 'models/project';
import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions';
-import { FilterBuilder } from 'services/api/filter-builder';
+import { FilterBuilder, joinFilters } from 'services/api/filter-builder';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
+import { AuthState } from 'store/auth/auth-reducer';
export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const response = await this.services.groupsService
- .contents('', {
- ...getParams(dataExplorer),
- excludeHomeProject: true,
- filters: new FilterBuilder().addDistinct('uuid', `${state.auth.config.uuidPrefix}-j7d0g-publicfavorites`).getFilters()
- });
+ .contents('', getParams(dataExplorer, state.auth));
api.dispatch<any>(updateFavorites(response.items.map(item => item.uuid)));
api.dispatch<any>(updatePublicFavorites(response.items.map(item => item.uuid)));
api.dispatch(updateResources(response.items));
}
}
-export const getParams = (dataExplorer: DataExplorer) => ({
+export const getParams = (dataExplorer: DataExplorer, authState: AuthState) => ({
...dataExplorerToListParams(dataExplorer),
order: getOrder(dataExplorer),
- filters: getFilters(dataExplorer),
+ filters: joinFilters(
+ getFilters(dataExplorer),
+ new FilterBuilder().addDistinct('uuid', `${authState.config.uuidPrefix}-j7d0g-publicfavorites`).getFilters(),
+ ),
+ excludeHomeProject: true,
});
const getOrder = (dataExplorer: DataExplorer) => {
? OrderDirection.ASC
: OrderDirection.DESC;
+ // Use createdAt as a secondary sort column so we break ties consistently.
return order
.addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
.addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
.addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
+ .addOrder(OrderDirection.DESC, "createdAt", GroupContentsResourcePrefix.PROCESS)
.getOrder();
} else {
return order.getOrder();