15560777340

Committed 10 Jun 2025 01:25PM UTC coverage: 76.954% (-0.04%) from 76.993%

Build # 15560777340

Build Type

Pull #11026

github

Committed by

web-flow

Commit Message

Merge 9eb3869d2 into 710995799

Pull Request Pull Request #11026: Update User Guide - Legend filtering for WMS layers

Run Details

31047 of 48334 branches covered (64.23%)

38674 of 50256 relevant lines covered (76.95%)

36.17 hits per line

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

8.33

/web/client/plugins/widgetbuilder/CatalogServiceEditor.jsx

import React, { useState } from 'react';
import { isEmpty } from 'lodash';

import uuid from 'uuid';
import CatalogServiceEditorComponent from '../../components/catalog/CatalogServiceEditor';
import { DEFAULT_ALLOWED_PROVIDERS } from '../MetadataExplorer';

const emptyService = {
    url: "",
    type: "wms",
    title: "",
    isNew: true,
    showAdvancedSettings: false,
    showTemplate: false,
    hideThumbnail: false,
    metadataTemplate: "<p>${description}</p>",
    excludeShowTemplate: true
};

const CatalogServiceEditor = ({
    protectedId,
    service: defaultService,
    catalogServices,
    error = () => {},
    onAddService = () => {},
    isNew,
    dashboardServices,
    defaultServices,
    defaultSelectedService,
    dashboardSelectedService,
    ...props
}) => {
    const [service, setService] = useState(() => {
        // [dashboardHasEmptyServices] if true => show the default services, else show the dashboard services with its stored configurations
        // adding (!dashboardServices) in the condition shows the expected behaviour
        const dashboardHasEmptyServices = isEmpty(dashboardSelectedService) && !dashboardServices;
        return isNew ? emptyService :
            dashboardHasEmptyServices ?
                {...defaultServices[defaultSelectedService], old: defaultServices[defaultSelectedService], key: defaultSelectedService, excludeShowTemplate: true} :
                {...dashboardServices[dashboardSelectedService || defaultSelectedService], old: dashboardServices[dashboardSelectedService || defaultSelectedService],
                    key: dashboardSelectedService || defaultSelectedService, excludeShowTemplate: true};
    });

    const existingServices = isEmpty(dashboardServices) ? defaultServices : dashboardServices;

    const addNewService = () => {
        if (service.type !== 'tms' && (!service.title || !service.url)) {
            error({ title: 'catalog.notification.errorTitle', message: 'catalog.notification.warningAddCatalogService'});
            return;
        }
        const key = !isNew ? service.key : service.title + uuid();
        const newService = {
            ...service, key, protectedId
        };
        onAddService(newService, existingServices, isNew);
    };

    const handleChangeServiceProperty = (property, value) => {
        setService({ ...service, [property]: value });
    };
    return (<div style={{padding: '1rem', height: '100%'}}>
        <CatalogServiceEditorComponent
            onChangeUrl={(url) => setService({...service, url})}
            onChangeType={(type) => setService({...service, type})}
            onChangeTitle={(title) => setService({...service, title})}
            service={{
                ...service,
                protectedId
            }}
            onChangeServiceFormat={(format) => setService({...service, format})}
            onToggleAdvancedSettings={() => setService({...service, showAdvancedSettings: !service.showAdvancedSettings})}
            onAddService={addNewService}
            onChangeServiceProperty={handleChangeServiceProperty}
            onToggleTemplate={() => setService({...service, showTemplate: !service.showTemplate})}
            onToggleThumbnail={() => setService({...service, hideThumbnail: !service.hideThumbnail})}
            serviceTypes={[{ name: "csw", label: "CSW" }, { name: "wms", label: "WMS" },
                { name: "wmts", label: "WMTS" }, { name: "tms", label: "TMS", allowedProviders: DEFAULT_ALLOWED_PROVIDERS }, {name: "wfs", label: "WFS"}]}
            onChangeMetadataTemplate={(metadataTemplate) => setService({...service, metadataTemplate})}
            services={existingServices}
            {...props}
        />
    </div>);
};

export default CatalogServiceEditor;

1	import React, { useState } from 'react';
2	import { isEmpty } from 'lodash';
3
4	import uuid from 'uuid';
5	import CatalogServiceEditorComponent from '../../components/catalog/CatalogServiceEditor';
6	import { DEFAULT_ALLOWED_PROVIDERS } from '../MetadataExplorer';
7
8	const emptyService = {	1✔
9	url: "",
10	type: "wms",
11	title: "",
12	isNew: true,
13	showAdvancedSettings: false,
14	showTemplate: false,
15	hideThumbnail: false,
16	metadataTemplate: "<p>${description}</p>",
17	excludeShowTemplate: true
18	};
19
20	const CatalogServiceEditor = ({	1✔
21	protectedId,
22	service: defaultService,
23	catalogServices,
24	error = () => {},	×
25	onAddService = () => {},	×
26	isNew,
27	dashboardServices,
28	defaultServices,
29	defaultSelectedService,
30	dashboardSelectedService,
31	...props
32	}) => {
33	const [service, setService] = useState(() => {	×
34	// [dashboardHasEmptyServices] if true => show the default services, else show the dashboard services with its stored configurations
35	// adding (!dashboardServices) in the condition shows the expected behaviour
36	const dashboardHasEmptyServices = isEmpty(dashboardSelectedService) && !dashboardServices;	×
37	return isNew ? emptyService :	×
38	dashboardHasEmptyServices ?	×
39	{...defaultServices[defaultSelectedService], old: defaultServices[defaultSelectedService], key: defaultSelectedService, excludeShowTemplate: true} :
40	{...dashboardServices[dashboardSelectedService \|\| defaultSelectedService], old: dashboardServices[dashboardSelectedService \|\| defaultSelectedService],	×
41	key: dashboardSelectedService \|\| defaultSelectedService, excludeShowTemplate: true};	×
42	});
43
44	const existingServices = isEmpty(dashboardServices) ? defaultServices : dashboardServices;	×
45
46	const addNewService = () => {	×
47	if (service.type !== 'tms' && (!service.title \|\| !service.url)) {	×
48	error({ title: 'catalog.notification.errorTitle', message: 'catalog.notification.warningAddCatalogService'});	×
49	return;	×
50	}
51	const key = !isNew ? service.key : service.title + uuid();	×
52	const newService = {	×
53	...service, key, protectedId
54	};
55	onAddService(newService, existingServices, isNew);	×
56	};
57
58	const handleChangeServiceProperty = (property, value) => {	×
59	setService({ ...service, [property]: value });	×
60	};
61	return (<div style={{padding: '1rem', height: '100%'}}>	×
62	<CatalogServiceEditorComponent
63	onChangeUrl={(url) => setService({...service, url})}	×
64	onChangeType={(type) => setService({...service, type})}	×
65	onChangeTitle={(title) => setService({...service, title})}	×
66	service={{
67	...service,
68	protectedId
69	}}
70	onChangeServiceFormat={(format) => setService({...service, format})}	×
71	onToggleAdvancedSettings={() => setService({...service, showAdvancedSettings: !service.showAdvancedSettings})}	×
72	onAddService={addNewService}
73	onChangeServiceProperty={handleChangeServiceProperty}
74	onToggleTemplate={() => setService({...service, showTemplate: !service.showTemplate})}	×
75	onToggleThumbnail={() => setService({...service, hideThumbnail: !service.hideThumbnail})}	×
76	serviceTypes={[{ name: "csw", label: "CSW" }, { name: "wms", label: "WMS" },
77	{ name: "wmts", label: "WMTS" }, { name: "tms", label: "TMS", allowedProviders: DEFAULT_ALLOWED_PROVIDERS }, {name: "wfs", label: "WFS"}]}
78	onChangeMetadataTemplate={(metadataTemplate) => setService({...service, metadataTemplate})}	×
79	services={existingServices}
80	{...props}
81	/>
82	</div>);
83	};
84
85	export default CatalogServiceEditor;

geosolutions-it / MapStore2 / 15560777340

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