@hmcts/media-viewer 4.2.4-exui-3994-f → 4.2.4-exui-3994-g

package/projects/media-viewer/src/lib/store/reducers/reducers.ts

@@ -1,35 +0,0 @@
-import { ActionReducerMap, createFeatureSelector } from '@ngrx/store';
-import * as fromDocument from './document.reducer';
-import * as fromAnnotation from './annotations.reducer';
-import * as fromTags from './tags.reducer';
-import * as fromBookmarks from './bookmarks.reducer';
-import * as fromRedaction from './redaction.reducer';
-import * as fromIcp from './icp.reducer';
-import { IcpState } from '../../icp/icp.interfaces';
-
-export interface State {
-  document: fromDocument.DocumentState;
-  annotations: fromAnnotation.AnnotationSetState;
-  tags: fromTags.TagsState;
-  bookmarks: fromBookmarks.BookmarksState;
-  redactions: fromRedaction.RedactionState;
-  icp: IcpState;
-}
-
-export const reducers: ActionReducerMap<State> = {
-  document: fromDocument.docReducer,
-  annotations: fromAnnotation.reducer,
-  tags: fromTags.tagsReducer,
-  bookmarks: fromBookmarks.bookmarksReducer,
-  redactions: fromRedaction.redactionReducer,
-  icp: fromIcp.icpReducer,
-};
-
-export const getMVState = createFeatureSelector<State>('media-viewer');
-
-export * from './document.reducer';
-export * from './annotations.reducer';
-export * from './tags.reducer';
-export * from './bookmarks.reducer';
-export * from './redaction.reducer';
-export * from './icp.reducer';

package/projects/media-viewer/src/lib/store/reducers/tags.reducer.ts

@@ -1,120 +0,0 @@
-import * as fromAnnotations from '../actions/annotation.actions';
-import * as fromTags from '../actions/tag.actions';
-import {StoreUtils} from '../store-utils';
-import {Annotation} from '../../annotations/annotation-set/annotation-view/annotation.model';
-
-export interface TagsState {
-  tagNameEnt: {[id: string]: string[]};
-  filteredComments: {[id: string]: string[]};
-  filteredPageEntities: {[id: string]: Annotation[]};
-  annotations: Annotation[];
-  formFilterState: {[id: string]: boolean};
-  filters: string[];
-}
-
-export const initialTagState: TagsState = {
-  tagNameEnt: {},
-  annotations: [],
-  filteredPageEntities: {},
-  filteredComments: {},
-  formFilterState: {},
-  filters: []
-};
-
-export function tagsReducer (
-  state = initialTagState,
-  action: fromAnnotations.AnnotationsActions | fromTags.TagsActions
-): TagsState {
-  switch (action.type) {
-    case fromAnnotations.LOAD_ANNOTATION_SET: {
-
-      return {
-        ...state,
-        ...initialTagState
-      };
-    }
-    case fromAnnotations.LOAD_ANNOTATION_SET_SUCCESS: {
-      const annotations = action.payload.body.annotations;
-      const tagNameEnt = StoreUtils.genTagNameEntities(annotations);
-      return {
-        ...state,
-        tagNameEnt,
-        annotations
-      };
-    }
-
-    case fromAnnotations.SAVE_ANNOTATION_SUCCESS: {
-      const payload = action.payload;
-
-      const anno = [...state.annotations].filter(a => a.id !== payload.id) || [];
-      const annotations = [...anno, payload];
-      const tagNameEnt =  StoreUtils.genTagNameEntities(annotations);
-      return {
-        ...state,
-        annotations,
-        tagNameEnt
-      };
-    }
-
-    case fromAnnotations.DELETE_ANNOTATION_SUCCESS: {
-      const id = action.payload;
-      const annotations = [...state.annotations].filter(a => a.id !== id);
-      const tagNameEnt =  StoreUtils.genTagNameEntities(annotations);
-      const filteredPageEntities = StoreUtils.groupByKeyEntities(annotations, 'page');
-      const filteredComments = {
-        ...state.filteredComments
-      };
-      delete filteredComments[id];
-      return {
-        ...state,
-        annotations,
-        tagNameEnt,
-        filteredComments,
-        filteredPageEntities,
-        filters: []
-      };
-    }
-
-
-    case fromTags.ADD_FILTER_TAGS: {
-      const formFilterState = action.payload;
-
-      const filters = Object.keys(formFilterState).reduce((arr: string[], key: string) => {
-        return formFilterState[key] ? [...arr, key] : arr;
-      }, []);
-
-      const filteredComments = filters.reduce((obj: {[id: string]: any}, f) => {
-        return {
-          ...obj,
-          ...state.tagNameEnt[f]
-        };
-      }, {});
-
-      const annotations = Object.keys(filteredComments).map(key => state.annotations.filter(a => a.id === key)[0]);
-      const filteredPageEntities = StoreUtils.groupByKeyEntities(annotations, 'page');
-      return {
-        ...state,
-        filters,
-        filteredComments,
-        filteredPageEntities,
-      };
-    }
-
-    case fromTags.CLEAR_FILTER_TAGS: {
-      return {
-        ...state,
-        filters: [],
-        filteredComments: {},
-        filteredPageEntities: {},
-      };
-    }
-
-  }
-
-  return state;
-}
-
-export const getTagNameEnt = (state: TagsState) => state.tagNameEnt;
-export const getFilters = (state: TagsState) => state.filters;
-export const getFilteredComments = (state: TagsState) => state.filteredComments;
-export const getFilteredPageEnt = (state: TagsState) => state.filteredPageEntities;

package/projects/media-viewer/src/lib/store/selectors/annotation.selectors.spec.ts

@@ -1,290 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { select, Store, StoreModule } from '@ngrx/store';
-import { reducers, State } from '../reducers/reducers';
-
-import * as fromSelectors from './annotation.selectors';
-import * as fromActions from '../actions/annotation.actions';
-import * as fromDocument from '../actions/document.actions';
-import * as fromTags from '../actions/tag.actions';
-  const comment = {
-    createdBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-    createdByDetails: {
-      forename: 'EM',
-      surname: 'showcase',
-      email: 'emshowcaseuser@hmcts.net'
-    },
-    lastModifiedByDetails: {
-      forename: 'EM',
-      surname: 'showcase',
-      email: 'emshowcaseuser@hmcts.net'
-    },
-    createdDate: '2020-04-17T12:54:26.117Z',
-    lastModifiedBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-    lastModifiedDate: '2020-04-17T12:54:34.417Z',
-    id: '9f84cb89-8286-4602-a3b9-672c15efc7eb',
-    content: 'this is my comment',
-    annotationId: 'c3adf070-353b-45d2-9a84-c912851cf34d'
-  };
-  const tags = [
-      {
-        name: 'important',
-        createdBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-        label: 'important',
-        color: null
-      }
-    ];
-  const anno = {
-    createdBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-    createdByDetails: {
-      forename: 'EM',
-      surname: 'showcase',
-      email: 'emshowcaseuser@hmcts.net'
-    },
-    lastModifiedByDetails: {
-      forename: 'EM',
-      surname: 'showcase',
-      email: 'emshowcaseuser@hmcts.net'
-    },
-    createdDate: '2020-04-17T11:52:06.344Z',
-    lastModifiedBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-    lastModifiedDate: '2020-04-17T11:52:06.344Z',
-    id: 'c3adf070-353b-45d2-9a84-c912851cf34d',
-    page: 1,
-    color: 'FFFF00',
-    annotationSetId: '200bcec6-d9cf-4866-b208-f2cc5db77279',
-    comments: [
-      comment
-    ],
-    tags,
-    rectangles: [
-      {
-        createdBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-        createdByDetails: {
-          forename: 'EM',
-          surname: 'showcase',
-          email: 'emshowcaseuser@hmcts.net'
-        },
-        lastModifiedByDetails: {
-          forename: 'EM',
-          surname: 'showcase',
-          email: 'emshowcaseuser@hmcts.net'
-        },
-        createdDate: '2020-04-17T11:52:06.409Z',
-        lastModifiedBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-        lastModifiedDate: '2020-04-17T11:52:06.409Z',
-        id: '10baecbb-7882-4efc-8da7-b694b180309e',
-        x: 148,
-        y: 673,
-        width: 325,
-        height: 173,
-        annotationId: 'c3adf070-353b-45d2-9a84-c912851cf34d'
-      }
-    ],
-    type: 'highlight',
-    positionTop: 673
-  };
-
-  const annoSet: any = {
-    createdBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-    createdByDetails: {
-      forename: 'EM',
-      surname: 'showcase',
-      email: 'emshowcaseuser@hmcts.net'
-    },
-    lastModifiedByDetails: {
-      forename: 'EM',
-      surname: 'showcase',
-      email: 'emshowcaseuser@hmcts.net'
-    },
-    createdDate: '2020-03-31T07:40:44.929Z',
-    lastModifiedBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-    lastModifiedDate: '2020-03-31T07:40:44.929Z',
-    id: '200bcec6-d9cf-4866-b208-f2cc5db77279',
-    documentId: 'assets/example4.pdf',
-    annotations: [
-      anno
-    ]
-
-  };
-
-describe('Annotations selectors', () => {
-  let store: Store<State>;
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({}),
-        StoreModule.forFeature('media-viewer', reducers),
-      ],
-    });
-    store = TestBed.inject(Store);
-    spyOn(store, 'dispatch').and.callThrough();
-  });
-
-  describe('getComponentSearchQueries', () => {
-    it('should return search query', () => {
-      let result;
-      store.pipe(select(fromSelectors.getComponentSearchQueries)).subscribe(value => {
-        result = value;
-      });
-      store.dispatch(new fromActions.SearchComment('this'));
-      expect(result).toEqual({commentSearch: 'this', });
-    });
-  });
-
-  describe('getComponentSearchText', () => {
-    it('should return search query', () => {
-      let result;
-      store.pipe(select(fromSelectors.getComponentSearchText)).subscribe(value => {
-        result = value;
-      });
-      store.dispatch(new fromActions.SearchComment('this'));
-      expect(result).toEqual('this');
-    });
-  });
-
-  describe('getAnnoPerPage', () => {
-    it('should return annotations per page', () => {
-      let result;
-      store.pipe(select(fromSelectors.getAnnoPerPage)).subscribe(value => {
-        result = value;
-      });
-      const payload: any = [{
-        div: {},
-        scale: 1,
-        rotation: 0,
-        id: '1'
-      }];
-      store.dispatch(new fromActions.LoadAnnotationSetSucess({ status: 200, body: annoSet }));
-      store.dispatch(new fromDocument.AddPages(payload));
-      const expected = [
-        {
-          anno: [anno],
-          styles: {left: undefined, height: undefined, width: undefined}
-        }
-      ];
-      expect(result).toEqual(expected);
-    });
-  });
-
-  describe('getCommentsArray', () => {
-    it('should return array of comments', () => {
-      let result;
-      store.pipe(select(fromSelectors.getCommentsArray)).subscribe(value => {
-        result = value;
-      });
-
-      const payload: any = [{
-        div: {},
-        id: '1',
-        scale: 1,
-        rotation: 0,
-        viewportScale: 1.3333
-      }];
-      store.dispatch(new fromActions.LoadAnnotationSetSucess({ status: 200, body: annoSet }));
-      store.dispatch(new fromDocument.AddPages(payload));
-      store.dispatch(new fromTags.AddFilterTags({ important: false }));
-      const pages =  {
-        '1': {
-          scaleRotation: { scale: 1, rotation: 0 },
-          styles: { left: undefined, height: undefined, width: undefined },
-          viewportScale: 1.3333
-        }
-      };
-      const expected = [
-        {...comment, tags, page: 1, pages}
-      ];
-      expect(result).toEqual(expected);
-    });
-  });
-
-
-  describe('getCommentsSummaryArray', () => {
-    it('should return array of comments', () => {
-      let result;
-      store.pipe(select(fromSelectors.getCommentSummary)).subscribe(value => {
-        result = value;
-      });
-
-      const payload: any = [{
-        div: {},
-        id: '1',
-        scale: 1,
-        rotation: 0,
-        viewportScale: 1.3333
-      }];
-      store.dispatch(new fromActions.LoadAnnotationSetSucess({ status: 200, body: annoSet }));
-      store.dispatch(new fromDocument.AddPages(payload));
-      store.dispatch(new fromTags.AddFilterTags({ important: false }));
-
-      const expected = [{
-        comment: 'this is my comment',
-        date: '17 April 2020',
-        page: 1,
-        tags: [{
-          color: null,
-          createdBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-          label: 'important',
-          name: 'important'
-        }],
-        user: 'EM showcase'
-      }];
-      expect(result).toEqual(expected);
-    });
-  });
-
-  describe('getFilteredAnnotations', () => {
-    it('should return array of comments', () => {
-      let result;
-      store.pipe(select(fromSelectors.getFilteredAnnotations)).subscribe(value => {
-        result = value;
-      });
-
-      const payload: any = [{
-        div: {},
-        id: '1',
-        scale: 1,
-        rotation: 0,
-        viewportScale: 1.3333
-      }];
-      store.dispatch(new fromActions.LoadAnnotationSetSucess({ status: 200, body: annoSet }));
-      store.dispatch(new fromDocument.AddPages(payload));
-      store.dispatch(new fromTags.AddFilterTags({ important: false }));
-      expect(result).toEqual([anno]);
-    });
-  });
-
-  describe('getCommentSummary', () => {
-    it('should return array of comment summary', () => {
-      let result;
-      store.pipe(select(fromSelectors.getCommentSummary)).subscribe(value => {
-        result = value;
-      });
-
-      const payload: any = [{
-        div: {},
-        id: '1',
-        scale: 1,
-        rotation: 0,
-        viewportScale: 1.3333
-      }];
-      store.dispatch(new fromActions.LoadAnnotationSetSucess({ status: 200, body: annoSet }));
-      store.dispatch(new fromDocument.AddPages(payload));
-      const cm = {
-        comment: 'this is my comment',
-        date: '17 April 2020',
-        page: 1,
-        tags: [{
-          color: null,
-          createdBy: 'b3afcb72-5e30-49cd-b833-88ab7aab619b',
-          label: 'important',
-           name: 'important'
-        }],
-        user: 'EM showcase'
-      };
-      store.dispatch(new fromTags.AddFilterTags({ important: false }));
-
-      expect(result).toEqual([cm]);
-    });
-  });
-
-});

package/projects/media-viewer/src/lib/store/selectors/annotation.selectors.ts

@@ -1,151 +0,0 @@
-import {createSelector} from '@ngrx/store';
-
-import * as fromFeature from '../reducers/reducers';
-import * as fromAnnotations from '../reducers/annotations.reducer';
-import * as fromTags from './tag.selectors';
-import * as fromDocument from './document.selectors';
-import {StoreUtils} from '../store-utils';
-import moment from 'moment-timezone';
-export const getAnnotationsSetState = createSelector(
-  fromFeature.getMVState,
-  (state: fromFeature.State) =>  state.annotations
-);
-
-export const getAnnotationEntities = createSelector(
-  getAnnotationsSetState,
-  fromAnnotations.getAnnoEnt
-);
-
-export const getSet = createSelector(
-  getAnnotationsSetState,
-  fromAnnotations.getAnnoSet
-);
-
-export const getDocumentIdSetId = createSelector(
-  getSet,
-  (annoSet) => {
-    return {
-      documentId: annoSet.documentId,
-      annotationSetId: annoSet.id
-    };
-  }
-);
-
-export const getAnnotationSet = createSelector(
-  getAnnotationEntities,
-  getSet,
-  (entities, set) => {
-    return {
-      ...set,
-      annotations: Object.keys(entities).map(key => entities[key])
-    };
-  }
-);
-
-export const getSelectedAnnotation = createSelector(
-  getAnnotationsSetState,
-  fromAnnotations.getSelectedAnno
-);
-
-export const getCommentEntities = createSelector(
-  getAnnotationsSetState,
-  fromAnnotations.getCommentEnts
-);
-
-
-export const getPageEntities = createSelector(
-  getAnnotationsSetState,
-  fromAnnotations.getAnnoPageEnt
-);
-
-export const getComponentSearchQueries = createSelector(
-  getAnnotationsSetState,
-  fromAnnotations.commentSearchQ
-);
-
-export const getComponentSearchText = createSelector(
-  getComponentSearchQueries,
-  (queries) => queries.commentSearch
-);
-
-export const getCommentSummaryFilters = createSelector(
-  getAnnotationsSetState,
-  fromAnnotations.getSummaryFilters
-);
-
-export const getAnnoPerPage = createSelector(
-  fromDocument.getPages,
-  getPageEntities,
-  fromTags.getFilteredPageEntities,
-  (pages, pageEnt, filteredPageEnt) => {
-    const isFiltered: boolean = !!Object.keys(filteredPageEnt).length;
-    const entities = isFiltered ? filteredPageEnt : pageEnt;
-    if (pages) {
-      const arr = [];
-      Object.keys(pages).forEach(key => {
-        arr.push({
-          anno: entities[key] ? entities[key] : [],
-          styles: pages[key].styles
-        });
-      });
-      return arr;
-    }
-  }
-);
-
-export const getCommentsArray = createSelector(
-  getCommentEntities,
-  fromDocument.getPages,
-  getAnnotationEntities,
-  fromTags.getTagFiltered,
-  (commentEnts, pages, annoEnts, filtered) => {
-    if (commentEnts && annoEnts && pages[1]) {
-        const isFiltered: boolean = !!Object.keys(filtered).length;
-        const com = isFiltered ? filtered : commentEnts;
-        return Object.keys(com).map(key => {
-          const page = annoEnts[key].page;
-          return {
-            ...commentEnts[key],
-            page,
-            pages
-          };
-        });
-    }
-  }
-);
-
-export const getCommentSummary = createSelector(
-  getCommentsArray,
-  getCommentSummaryFilters,
-  (commentSummary = [], filters) => {
-    const comments = StoreUtils.filterCommentsSummary(commentSummary, filters.filters);
-    if (comments.length) {
-      const savedComments  = comments.filter((comment) => {
-        return comment.createdByDetails !== undefined;
-      }
-      );
-      return savedComments.map((comment) => {
-        return {
-          page: comment.page,
-          user: comment.createdByDetails.forename.concat(' ').concat(comment.createdByDetails.surname),
-          date: moment(comment.lastModifiedDate).format('D MMMM YYYY'),
-          tags: comment.tags,
-          comment: comment.content
-        };
-      });
-    }
-    return [''];
-  }
-);
-
-
-export const getFilteredAnnotations = createSelector(
-  getAnnotationEntities,
-  fromTags.getTagFiltered,
-  (annoEnt, filters) => {
-    const isFiltered: boolean = !!Object.keys(filters).length;
-    const anno = isFiltered ? filters : annoEnt;
-    return Object.keys(anno).map(key => annoEnt[key])
-      .filter(annotation => annotation.comments && annotation.comments.length > 0);
-  }
-);

package/projects/media-viewer/src/lib/store/selectors/bookmark.selectors.spec.ts

@@ -1,63 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { select, Store, StoreModule } from '@ngrx/store';
-import { reducers, State } from '../reducers/reducers';
-
-import * as fromSelectors from './bookmark.selectors';
-import * as fromActions from '../actions/bookmark.actions';
-import * as fromDocActions from '../actions/document.actions';
-
-describe('Bookmarks selectors', () => {
-
-  let store: Store<State>;
-  const bookmark = {
-    name: 'bookmark', xCoordinate: 100, yCoordinate: 50, documentId: 'documentId', id: 'id', pageNumber: 1, zoom: 1
-  } as any;
-  const page = {
-    div: {
-      clientHeight: 466.666
-    },
-    scale: 1,
-    rotation: 0,
-    id: '1',
-    viewportScale: 1.33333
-  };
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({}),
-        StoreModule.forFeature('media-viewer', reducers),
-      ],
-    });
-    store = TestBed.inject(Store);
-    spyOn(store, 'dispatch').and.callThrough();
-  });
-
-  it('should return bookmark info', (done) => {
-    const bookmark2 = { ...bookmark, name: 'bookmark 2', id: 'id2', previous: 'id' };
-    const payload: any = { pageNumber: 1, left: 100, top: 200 };
-    store.dispatch(new fromDocActions.PdfPositionUpdate(payload));
-    store.dispatch(new fromDocActions.SetDocumentId('documentId'));
-    store.dispatch(new fromActions.LoadBookmarksSuccess({ body: [bookmark, bookmark2], status: 200 }));
-
-    store.dispatch(new fromDocActions.AddPages([page]));
-
-    store.pipe(select(fromSelectors.getBookmarkInfo)).subscribe(value => {
-
-      const expected = { pageNumber: 0, xCoordinate: 100, yCoordinate: 200, previous: 'id2', documentId: 'documentId' };
-      expect(value).toEqual(expected);
-      done();
-    });
-  });
-
-  it('should return pages of bookmarks', (done) => {
-    store.dispatch(new fromDocActions.AddPages([page]));
-
-    store.pipe(select(fromSelectors.getBookmarksPerPage)).subscribe(value => {
-      const expected = [{ bookmark: [], styles: { left: undefined, height: 466.666, width: undefined }}];
-
-      expect(value).toEqual(expected);
-      done();
-    });
-  });
-});