Skip to content

fix: detailed emptyx response only when logged in + map is always activated #100

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.

Sign up for GitHub

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

Open
techtimo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: detailed emptyx response only when logged in + map is always activated #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 admin/class-spotmap-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public function enqueue_scripts($hook)
'feeds' => $this->db->get_all_feednames(),
'defaultValues' => Spotmap_Options::get_settings(),
'marker' => Spotmap_Options::get_marker_options(),
'isLoggedIn' => true,
]);
}

Expand Down
1 change: 1 addition & 0 deletions public/class-spotmap-public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ function localize_js_script($script_slug){
'defaultValues' => $default_values,
'marker' => Spotmap_Options::get_marker_options(),
'postsFeedNames' => array_values( array_column( $posts_type_feeds, 'name' ) ),
'isLoggedIn' => is_user_logged_in(),
]);
}

Expand Down
99 changes: 42 additions & 57 deletions src/map-engine/Spotmap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export class Spotmap {
private onVisibilityChange: ( () => void ) | null = null;
private reloadBody: AjaxRequestBody | null = null;
private lodManager: LodManager | null = null;
private emptyStatePopup: L.Popup | null = null;

constructor( options: SpotmapOptions ) {
this.options = options;
Expand Down Expand Up @@ -165,11 +166,6 @@ export class Spotmap {
el as HTMLElement & { _spotmapOptions?: SpotmapOptions }
)._spotmapOptions = this.options;

// Remove any empty-state overlay left over from a previous render
el.querySelectorAll( '.spotmap-empty-state' ).forEach( ( n ) =>
n.remove()
);

if ( ( el as HTMLElement & { _leaflet_id?: number } )._leaflet_id ) {
if (
JSON.stringify( this.options ) === JSON.stringify( oldOptions )
Expand Down Expand Up @@ -411,6 +407,10 @@ export class Spotmap {
// during teardown and crashes. Setting text to null first makes
// _textRedraw a no-op for that final render pass.
this.lineManager?.clearArrows();
if ( this.emptyStatePopup ) {
this.map.closePopup( this.emptyStatePopup );
this.emptyStatePopup = null;
}
this.map.remove();
}
}
Expand Down Expand Up @@ -547,65 +547,50 @@ export class Spotmap {
}

private showEmptyState(): void {
const container = this.map.getContainer();

// Build a human-readable summary of active filters
const parts: string[] = [];

let feeds: string[];
if ( Array.isArray( this.options.feeds ) ) {
feeds = this.options.feeds;
} else if ( this.options.feeds ) {
feeds = String( this.options.feeds )
.split( ',' )
.map( ( f ) => f.trim() )
.filter( Boolean );
} else {
feeds = [];
if ( this.emptyStatePopup ) {
return;
}

if ( feeds.length > 0 ) {
parts.push( `Feeds: ${ feeds.join( ', ' ) }` );
}
this.map.setView( [ 0, 0 ], 12, { animate: false } );

const { from, to } = this.options.dateRange ?? {};
if ( from || to ) {
const range = [ from, to ].filter( Boolean ).join( ' – ' );
parts.push( `Date range: ${ range }` );
}
let detail = '';
if ( spotmapjsobj.isLoggedIn ) {
const parts: string[] = [];
const feeds = this.options.feeds;

const overlay = document.createElement( 'div' );
overlay.className = 'spotmap-empty-state';
overlay.style.cssText = [
'position:absolute',
'inset:0',
'z-index:1000',
'display:flex',
'flex-direction:column',
'align-items:center',
'justify-content:center',
'background:#f0f0f0',
'color:#666',
'gap:8px',
'text-align:center',
'padding:16px',
'font-size:14px',
'line-height:1.4',
].join( ';' );

const title = document.createElement( 'strong' );
title.textContent = 'No points to display';
overlay.appendChild( title );

const detail = document.createElement( 'span' );
detail.textContent =
parts.length > 0
if ( feeds.length > 0 ) {
parts.push( `Feeds: ${ feeds.join( ', ' ) }` );
}

const { from, to } = this.options.dateRange ?? {};
if ( from || to ) {
parts.push( `Date range: ${ [ from, to ].filter( Boolean ).join( ' – ' ) }` );
}

detail = parts.length > 0
? `No tracking data was found for ${ parts.join( ', ' ) }.`
: 'No tracking data has been stored yet.';
overlay.appendChild( detail );
}

// Leaflet already sets position:relative on the container
container.appendChild( overlay );
const content = `<strong>No points to display</strong>${
detail ? `<br><span style="font-size:0.9em;color:#666">${ detail }</span>` : ''
}`;

this.emptyStatePopup = L.popup( {
closeButton: false,
closeOnClick: false,
autoClose: false,
} )
.setLatLng( [ 0, 0 ] )
.setContent( content )
.openOn( this.map );

const tip = this.emptyStatePopup
.getElement()
?.querySelector< HTMLElement >( '.leaflet-popup-tip-container' );
if ( tip ) {
tip.style.display = 'none';
}
}

private startAutoReload( body: AjaxRequestBody ): void {
Expand Down
1 change: 1 addition & 0 deletions src/map-engine/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface SpotmapGlobal {
feeds: string[];
defaultValues: Record< string, unknown >;
marker: Record< string, MarkerTypeConfig >;
isLoggedIn: boolean;
}

export interface TileLayerConfig {
Expand Down
Loading