Merge pull request #5 from laravelcm/validation-rules

Validation rules

Author: mckenziearts

src/app/core/interfaces/session.interface.ts

@@ -1,7 +1,11 @@
+export interface SessionState {
+  formErrors: IValidationError | null;
+}
+
 export type IValidationError = {
   message: string;
   errors: {
     [key: string]: string[];
   };
   status_code: number;
-};
+};

src/app/core/store/app.store.ts

@@ -1,7 +1,8 @@
 import { routerReducer, RouterState } from '@ngrx/router-store';
 import { Action, ActionReducerMap } from '@ngrx/store';
 
-import { sessionFeatureKey, sessionReducer, SessionState } from './session/session.reducer';
+import { SessionState } from '../interfaces/session.interface';
+import { sessionFeatureKey, sessionReducer } from './session/session.reducer';
 
 export interface AppState {
   router: RouterState;

src/app/core/store/session/session.reducer.ts

@@ -1,12 +1,8 @@
 import { createReducer, on } from '@ngrx/store';
 
-import { IValidationError } from '@app/core/interfaces/session.interface';
+import { SessionState } from '@app/core/interfaces/session.interface';
 import * as SessionActions from './session.actions';
 
-export interface SessionState {
-  formErrors: IValidationError | null;
-}
-
 export const sessionFeatureKey = 'session';
 
 export const sessionState: SessionState = {

src/app/core/store/session/session.selectors.ts

@@ -1,6 +1,7 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store';
 
-import { sessionFeatureKey, SessionState } from './session.reducer';
+import { SessionState } from '@app/core/interfaces/session.interface';
+import { sessionFeatureKey } from './session.reducer';
 
 export const sessionFeatureSelector =
   createFeatureSelector<SessionState>(sessionFeatureKey);

src/app/modules/authentication/pages/reset-password/reset-password.component.ts

@@ -3,14 +3,14 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { map, Observable } from 'rxjs';
 
+import { PasswordRules } from '@app/shared/rules/password.rule';
 import {
   selectError,
   selectLoading,
   selectMessage,
   selectResetPasswordToken,
 } from '../../store/auth.selectors';
 import { resetPasswordAction } from '../../store/auth.actions';
-import { PasswordRules } from '../../rules/password.rules';
 
 @Component({
   templateUrl: './reset-password.component.html',
@@ -29,11 +29,8 @@ export class ResetPasswordComponent {
   );
 
   public error$: Observable<string | null> = this.store.select(selectError);
-
   public message$: Observable<string | null> = this.store.select(selectMessage);
-
   public loading$: Observable<boolean> = this.store.select(selectLoading);
-
   public token$: Observable<string | null> = this.store.select(
     selectResetPasswordToken
   );

src/app/shared/interfaces/response.interface.ts

@@ -10,13 +10,13 @@ export type IFilterParams = {
 
 export interface Pagination {
   total: number;
-  per_page: number;
-  current_page: number;
-  next_page: string | null;
-  prev_page: string | null;
-  first_page: string | null;
-  last_page: string | null;
+  perPage: number;
+  currentPage: number;
+  nextPage: string | null;
+  prevPage: string | null;
+  firstPage: string | null;
+  lastPage: string | null;
   from: number;
   to: number;
-  total_pages: number;
+  totalPages: number;
 }

src/app/shared/interfaces/values.interface.ts

@@ -1,10 +1,12 @@
+import { Pagination } from './response.interface';
+
 /**
  * This pagination Object is the default structure of
  * a Custom Laravel Eloquent Pagination Response
  *
  * @see https://laravel.com/docs/eloquent-resources#pagination
  */
-export const pagination = {
+export const pagination: Pagination = {
   total: 0,
   perPage: 0,
   currentPage: 0,

src/app/modules/authentication/rules/password.rules.ts renamed to src/app/shared/rules/password.rule.ts

@@ -0,0 +1,12 @@
+import { AbstractControl, ValidatorFn } from '@angular/forms';
+
+export class WhiteSpaceRule {
+  static noWhitespace(controlName: string): ValidatorFn {
+    return (controls: AbstractControl) => {
+      const control = controls.get(controlName);
+      const isWhitespace = (control?.value || '').trim().length === 0;
+      const isValid = !isWhitespace;
+      return isValid ? null : { whitespace: true };
+    };
+  }
+}