Skip to content

feat(order): change order of results #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/media/components/page/page.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<mrs-media-search-container></mrs-media-search-container>
<mrs-media-filter-container></mrs-media-filter-container>
<mrs-media-order-container></mrs-media-order-container>
<mrs-media-list-container></mrs-media-list-container>
1 change: 1 addition & 0 deletions src/app/media/features/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from './filter';
export * from './order';
export * from './search';
1 change: 1 addition & 0 deletions src/app/media/features/order/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './order';
1 change: 1 addition & 0 deletions src/app/media/features/order/components/order/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './order.component';
10 changes: 10 additions & 0 deletions src/app/media/features/order/components/order/order.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<mat-form-field>
<mat-label>Order direction:</mat-label>
<mat-select [formControl]="input"
(selectionChange)="set?.emit($event?.value)">
<mat-option *ngFor="let value of values"
[value]="value?.value">
{{ value?.label }}
</mat-option>
</mat-select>
</mat-form-field>
21 changes: 21 additions & 0 deletions src/app/media/features/order/components/order/order.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import { FormControl } from '@angular/forms';

import { Order } from '../../models';

@Component({
selector: 'mrs-media-order',
templateUrl: './order.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class OrderComponent {
@Input() order: Order = null;
@Output() set = new EventEmitter<string>();

values = [
{ value: Order.asc, label: 'Ascending' },
{ value: Order.desc, label: 'Descending' }
];

input: FormControl = new FormControl();
}
1 change: 1 addition & 0 deletions src/app/media/features/order/containers/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './order.container';
3 changes: 3 additions & 0 deletions src/app/media/features/order/containers/order.container.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<mrs-media-order [order]="order$ | async"
(set)="set($event)">
</mrs-media-order>
21 changes: 21 additions & 0 deletions src/app/media/features/order/containers/order.container.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { select, Store } from '@ngrx/store';
import { Observable } from 'rxjs';

import { Order } from '../models';
import { getOrder, OrderActions } from '../store';

@Component({
selector: 'mrs-media-order-container',
templateUrl: './order.container.html',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class OrderContainerComponent {
order$: Observable<Order> = this.store.pipe(select(getOrder));

constructor(private store: Store<{}>) {}

set(order: Order) {
this.store.dispatch(OrderActions.set({ order }));
}
}
5 changes: 5 additions & 0 deletions src/app/media/features/order/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export * from './components';
export * from './containers';
export * from './models';
export * from './order.module';
export * from './store';
1 change: 1 addition & 0 deletions src/app/media/features/order/models/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './order.enum';
4 changes: 4 additions & 0 deletions src/app/media/features/order/models/order.enum.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export enum Order {
asc,
desc
}
26 changes: 26 additions & 0 deletions src/app/media/features/order/order.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';

import { OrderComponent } from './components';
import { OrderContainerComponent } from './containers';
import { OrderStoreModule } from './store';

const components = [OrderComponent];
const containers = [OrderContainerComponent];

@NgModule({
declarations: [...components, ...containers],
entryComponents: [...containers],
exports: [...containers],
imports: [
CommonModule,
ReactiveFormsModule,
OrderStoreModule,
MatInputModule,
MatSelectModule
]
})
export class OrderModule {}
6 changes: 6 additions & 0 deletions src/app/media/features/order/store/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import * as OrderActions from './order.actions';

export { OrderActions };
export * from './order.module';
export * from './order.reducer';
export * from './order.selectors';
10 changes: 10 additions & 0 deletions src/app/media/features/order/store/order.actions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { createAction, props, union } from '@ngrx/store';

import { Order } from '../models';

export const clear = createAction('[Media Order] Clear');

export const set = createAction('[Media Order] Set', props<{ order: Order }>());

const all = union({ clear, set });
export type OrderActionsUnion = typeof all;
10 changes: 10 additions & 0 deletions src/app/media/features/order/store/order.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { NgModule } from '@angular/core';
import { StoreModule } from '@ngrx/store';

import { orderReducer } from './order.reducer';
import { orderSelectorName } from './order.selectors';

@NgModule({
imports: [StoreModule.forFeature(orderSelectorName, orderReducer)]
})
export class OrderStoreModule {}
32 changes: 32 additions & 0 deletions src/app/media/features/order/store/order.reducer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { createReducer, on } from '@ngrx/store';

import { Order } from '../models';
import * as OrderActions from './order.actions';

export interface OrderState {
order: Order;
}

const initialState: OrderState = {
order: null
};

const reducer = createReducer(
initialState,

on(OrderActions.set, (state, { order }) => ({
...state,
order
})),

on(OrderActions.clear, () => ({
...initialState
}))
);

export function orderReducer(
state: OrderState,
action: OrderActions.OrderActionsUnion
) {
return reducer(state, action);
}
12 changes: 12 additions & 0 deletions src/app/media/features/order/store/order.selectors.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { createFeatureSelector, createSelector } from '@ngrx/store';

import { OrderState } from './order.reducer';

export const orderSelectorName = 'order';

const getOrderState = createFeatureSelector<OrderState>(orderSelectorName);

export const getOrder = createSelector(
getOrderState,
(state: OrderState) => !!state && state.order
);
8 changes: 5 additions & 3 deletions src/app/media/media.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';

import { ListComponent, ListItemComponent, PageComponent } from './components';
import { ListContainerComponent } from './containers';
import { FilterModule, SearchModule } from './features';
import { FilterModule, OrderModule, SearchModule } from './features';
import { MediaRoutingModule } from './media.routing';
import { MediaStoreModule } from './store';

Expand All @@ -17,8 +17,10 @@ const containers = [ListContainerComponent];
CommonModule,
MediaRoutingModule,
MediaStoreModule,
SearchModule,
FilterModule

FilterModule,
OrderModule,
SearchModule
]
})
export class MediaModule {}
11 changes: 9 additions & 2 deletions src/app/media/store/media.selectors.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createFeatureSelector, createSelector } from '@ngrx/store';

import { getFilter, getSearchQuery } from '../features';
import { getFilter, getOrder, getSearchQuery, Order } from '../features';
import { Media, MediaType } from '../models';
import { mediaAdapter, MediaState } from './media.reducer';

Expand Down Expand Up @@ -41,10 +41,17 @@ export const getMediaFiltered = createSelector(
items
);

export const getMediaResults = createSelector(
export const getMediaSearched = createSelector(
getMediaFiltered,
getSearchQuery,
(items: Media[], query: string) =>
!!items &&
items.filter(({ title }: Media) => new RegExp(query, 'i').test(title))
);

export const getMediaResults = createSelector(
getMediaSearched,
getOrder,
(items: Media[], order: Order) =>
(!!items && (order === Order.desc && [...items].reverse())) || items
);