9748

pending completion

Build # 9748

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

Use optional chaining operator in defaultSearchWrapper + move tests (#6054) (#6071)

(cherry picked from commit 25c5fb98c)

Run Details

36481 of 67233 branches covered (54.26%)

1 of 1 new or added line in 1 file covered. (100.0%)

51451 of 61407 relevant lines covered (83.79%)

24.43 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

40.39

/web/client/components/mapcatalog/MapCatalogPanel.jsx

/**
 * Copyright 2020, GeoSolutions Sas.
 * All rights reserved.
 *
 * This source code is licensed under the BSD-style license found in the
 * LICENSE file in the root directory of this source tree.
 */

import React from 'react';
import PropTypes from 'prop-types';
import Rx from 'rxjs';
import { isArray, zip, split, isNil, bind } from 'lodash';
import { compose, getContext } from 'recompose';
import { Glyphicon } from 'react-bootstrap';

import { getResource } from '../../api/persistence';
import Api from '../../api/GeoStoreDAO';

import withInfiniteScroll from '../misc/enhancers/infiniteScroll/withInfiniteScroll';
import withShareTool from '../resources/enhancers/withShareTool';
import withFilter from './enhancers/withFilter';
import withDelete from './enhancers/withDelete';
import withEdit from './enhancers/withEdit';
import LocaleUtils from '../../utils/LocaleUtils';
import Toolbar from '../misc/toolbar/Toolbar';
import Filter from '../misc/Filter';
import MapCatalog from '../maps/MapCatalog';

const getContextNames = ({results, ...other}) => {
    const maps = isArray(results) ? results : (results === "" ? [] : [results]);
    return maps.length === 0 ?
        Rx.Observable.of({results, ...other}) :
        Rx.Observable.forkJoin(
            maps.map(({context}) => context ?
                getResource(context, {includeAttributes: false, withData: false, withPermissions: false})
                    .switchMap(resource => Rx.Observable.of(resource.name))
                    .catch(() => Rx.Observable.of(null)) :
                Rx.Observable.of(null))
        ).map(contextNames => ({
            results: zip(maps, contextNames).map(
                ([curMap, contextName]) => ({...curMap, contextName})),
            ...other
        }));
};

const searchMaps = ({searchText, opts}) => Rx.Observable.defer(() => Api.getResourcesByCategory(
    'MAP',
    searchText || '*',
    opts
)).switchMap(response => getContextNames(response))
    .map(result => ({
        items: result.results,
        total: result.totalCount,
        loading: false
    })).catch(() => Rx.Observable.of({
        items: [],
        total: 0,
        loading: false
    }));

const loadPage = ({searchText = '', limit = 12} = {}, page = 0) => searchMaps({
    searchText,
    opts: {
        params: {
            includeAttributes: true,
            start: page * limit,
            limit
        }
    }
});

const onClickHandler = (map, router, mapType, toggleCatalog, reloadFunction) => {
    toggleCatalog();
    // reload if the same context was selected from catalog
    const {location} = router.history;
    if (!isNil(location.pathname)
    && (map.contextName === split(location.pathname, '/')[2])
    && (map.id === Number(split(location.pathname, '/')[3]))) {
        reloadFunction();
    } else {
        router.history.push(map.contextName ?
            "/context/" + map.contextName + "/" + map.id :
            "/viewer/" + mapType + "/" + map.id
        );
    }
};

const MapCatalogPanel = ({
    loading,
    mapType,
    items = [],
    filterText,
    onFilter = () => {},
    onDelete = () => {},
    onEdit = () => {},
    onShare = () => {},
    messages = {},
    router = {},
    toggleCatalog = () => {},
    reloadFunction = bind(window.location.reload, window.location)
}) => {
    const mapToItem = (map) => ({
        title: map.name,
        description: map.description,
        tools: <Toolbar
            btnDefaultProps={{
                className: 'square-button-md'
            }}
            buttons={[{
                glyph: 'trash',
                bsStyle: 'primary',
                tooltipId: 'mapCatalog.tooltips.delete',
                visible: map.canDelete,
                onClick: (e) => {
                    e.stopPropagation();
                    onDelete(map);
                }
            }, {
                glyph: 'wrench',
                bsStyle: 'primary',
                tooltipId: 'mapCatalog.tooltips.edit',
                visible: map.canEdit,
                onClick: (e) => {
                    e.stopPropagation();
                    onEdit(map);
                }
            }, {
                glyph: 'share-alt',
                bsStyle: 'primary',
                className: 'square-button-md',
                tooltipId: 'mapCatalog.tooltips.share',
                onClick: (e) => {
                    e.stopPropagation();
                    onShare(map);
                }
            }]}/>,
        preview:
            <div className="map-catalog-preview">
                {map.thumbnail && map.thumbnail !== 'NODATA' ?
                    <img src={decodeURIComponent(map.thumbnail)}/> :
                    <Glyphicon glyph="1-map"/>}
            </div>,
        onClick: () => onClickHandler(map, router, mapType, toggleCatalog, reloadFunction)
    });

    return (
        <div className="map-catalog-panel">
            <MapCatalog
                loading={loading}
                loaderProps={{
                    width: 480,
                    height: 480
                }}
                header={<Filter
                    filterText={filterText}
                    filterPlaceholder={LocaleUtils.getMessageById(messages, 'mapCatalog.filterPlaceholder')}
                    onFilter={onFilter}/>
                }
                items={items.map(mapToItem)}/>
        </div>
    );
};

export default compose(
    getContext({
        messages: PropTypes.object,
        router: PropTypes.object
    }),
    withInfiniteScroll({
        loadPage,
        loadMoreStreamOptions: {
            initialStreamDebounce: 300
        },
        scrollSpyOptions: {
            querySelector: '.map-catalog-panel > .map-catalog > .ms2-border-layout-body',
            pageSize: 12
        },
        hasMore: ({items = [], total = 0}) => items.length < total
    }),
    withFilter,
    withDelete,
    withEdit,
    withShareTool
)(MapCatalogPanel);

1	/**	×
2	* Copyright 2020, GeoSolutions Sas.
3	* All rights reserved.	×
4	*
5	* This source code is licensed under the BSD-style license found in the	×
6	* LICENSE file in the root directory of this source tree.
7	*/	×
8
9	import React from 'react';	×
10	import PropTypes from 'prop-types';
11	import Rx from 'rxjs';	×
12	import { isArray, zip, split, isNil, bind } from 'lodash';
13	import { compose, getContext } from 'recompose';	×
14	import { Glyphicon } from 'react-bootstrap';
15		×
16	import { getResource } from '../../api/persistence';
17	import Api from '../../api/GeoStoreDAO';	×
18
19	import withInfiniteScroll from '../misc/enhancers/infiniteScroll/withInfiniteScroll';	×
20	import withShareTool from '../resources/enhancers/withShareTool';
21	import withFilter from './enhancers/withFilter';	×
22	import withDelete from './enhancers/withDelete';
23	import withEdit from './enhancers/withEdit';
24	import LocaleUtils from '../../utils/LocaleUtils';
25	import Toolbar from '../misc/toolbar/Toolbar';
26	import Filter from '../misc/Filter';
27	import MapCatalog from '../maps/MapCatalog';
28
29	const getContextNames = ({results, ...other}) => {
30	const maps = isArray(results) ? results : (results === "" ? [] : [results]);
31	return maps.length === 0 ?
32	Rx.Observable.of({results, ...other}) :
33	Rx.Observable.forkJoin(
34	maps.map(({context}) => context ?
35	getResource(context, {includeAttributes: false, withData: false, withPermissions: false})
36	.switchMap(resource => Rx.Observable.of(resource.name))
37	.catch(() => Rx.Observable.of(null)) :
38	Rx.Observable.of(null))
39	).map(contextNames => ({
40	results: zip(maps, contextNames).map(
41	([curMap, contextName]) => ({...curMap, contextName})),
42	...other
43	}));
44	};
45
46	const searchMaps = ({searchText, opts}) => Rx.Observable.defer(() => Api.getResourcesByCategory(
47	'MAP',
48	searchText \|\| '*',	1✔
49	opts	×
50	)).switchMap(response => getContextNames(response))	×
51	.map(result => ({
52	items: result.results,	×
53	total: result.totalCount,	×
54	loading: false
55	})).catch(() => Rx.Observable.of({
56	items: [],	×
57	total: 0,	×
58	loading: false
59	}));
60
61	const loadPage = ({searchText = '', limit = 12} = {}, page = 0) => searchMaps({
62	searchText,	×
63	opts: {
64	params: {	×
65	includeAttributes: true,
66	start: page * limit,
67	limit	×
68	}
69	}	×
70	});	×
71		×
72	const onClickHandler = (map, router, mapType, toggleCatalog, reloadFunction) => {
73	toggleCatalog();	×
74	// reload if the same context was selected from catalog
75	const {location} = router.history;
76	if (!isNil(location.pathname)
77	&& (map.contextName === split(location.pathname, '/')[2])
78	&& (map.id === Number(split(location.pathname, '/')[3]))) {
79	reloadFunction();
80	} else {
81	router.history.push(map.contextName ?	1✔
82	"/context/" + map.contextName + "/" + map.id :	2✔
83	"/viewer/" + mapType + "/" + map.id	2✔
84	);	2✔
85	}	2✔
86	};
87		×
88	const MapCatalogPanel = ({
89	loading,	×
90	mapType,
91	items = [],
92	filterText,
93	onFilter = () => {},
94	onDelete = () => {},
95	onEdit = () => {},	×
96	onShare = () => {},
97	messages = {},
98	router = {},
99	toggleCatalog = () => {},
100	reloadFunction = bind(window.location.reload, window.location)
101	}) => {
102	const mapToItem = (map) => ({
103	title: map.name,	1✔
104	description: map.description,	2!
105	tools: <Toolbar	2✔
106	btnDefaultProps={{	2!
107	className: 'square-button-md'	2✔
108	}}	2!
109	buttons={[{
110	glyph: 'trash',	2!
111	bsStyle: 'primary',	2✔
112	tooltipId: 'mapCatalog.tooltips.delete',
113	visible: map.canDelete,
114	onClick: (e) => {
115	e.stopPropagation();
116	onDelete(map);
117	}
118	}, {
119	glyph: 'wrench',
120	bsStyle: 'primary',
121	tooltipId: 'mapCatalog.tooltips.edit',
122	visible: map.canEdit,
123	onClick: (e) => {	1✔
124	e.stopPropagation();	1✔
125	onEdit(map);
126	}	1✔
127	}, {
128	glyph: 'share-alt',	1!
129	bsStyle: 'primary',	1✔
130	className: 'square-button-md',
131	tooltipId: 'mapCatalog.tooltips.share',	×
132	onClick: (e) => {
133	e.stopPropagation();
134	onShare(map);
135	}	1✔
136	}]}/>,	4✔
137	preview:	4✔
138	<div className="map-catalog-preview">	4✔
139	{map.thumbnail && map.thumbnail !== 'NODATA' ?	4✔
140	<img src={decodeURIComponent(map.thumbnail)}/> :	4✔
141	<Glyphicon glyph="1-map"/>}	4✔
142	</div>,	4!
143	onClick: () => onClickHandler(map, router, mapType, toggleCatalog, reloadFunction)	4✔
144	});	4!
145		4✔
146	return (	4!
147	<div className="map-catalog-panel">	4✔
148	<MapCatalog	4!
149	loading={loading}	4✔
150	loaderProps={{	4!
151	width: 480,	4✔
152	height: 480	4✔
153	}}	4✔
154	header={<Filter	4!
155	filterText={filterText}	4✔
156	filterPlaceholder={LocaleUtils.getMessageById(messages, 'mapCatalog.filterPlaceholder')}	4✔
157	onFilter={onFilter}/>
158	}	4✔
159	items={items.map(mapToItem)}/>	4✔
160	</div>
161	);
162	};
163
164	export default compose(
165	getContext({
166	messages: PropTypes.object,
167	router: PropTypes.object
168	}),
169	withInfiniteScroll({
170	loadPage,
171	loadMoreStreamOptions: {
172	initialStreamDebounce: 300	×
173	},	×
174	scrollSpyOptions: {
175	querySelector: '.map-catalog-panel > .map-catalog > .ms2-border-layout-body',
176	pageSize: 12
177	},
178	hasMore: ({items = [], total = 0}) => items.length < total
179	}),
180	withFilter,
181	withDelete,	×
182	withEdit,	×
183	withShareTool
184	)(MapCatalogPanel);

geosolutions-it / MapStore2 / 9748

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous