Normalise a bunch of the file path display.

Author: johnbillion

dispatchers/Html.php

@@ -400,6 +400,8 @@ protected function before_output() {
 				],
 				'file_path_map' => QM_Output_Html::get_file_path_map(),
 				'file_link_format' => QM_Output_Html::get_file_link_format(),
+				'abspath' => QM_Util::normalize_path( ABSPATH ),
+				'contentpath' => QM_Util::normalize_path( dirname( WP_CONTENT_DIR ) . '/' ),
 			],
 			'number_format' => $wp_locale->number_format,
 			'locale_data' => self::get_script_locale_data(),

output/components/source-location.tsx

@@ -55,7 +55,7 @@ export const SourceLocation = ( { text, file, line = 0, isFileName = false, expa
 					<>
 						<br/>
 						<span className="qm-info qm-supplemental">
-							{ `${mappedFile}:${line}` }
+							{ `${Utils.stripAbspath( file, settings )}:${line}` }
 						</span>
 					</>
 				) }

output/contexts/main-context.tsx

@@ -13,6 +13,8 @@ export interface SettingsType {
 	extended_query_prompt_reason: 'conflict' | 'disabled' | 'failed' | null;
 	file_path_map: Record<string, string>;
 	file_link_format: string | false;
+	abspath: string;
+	contentpath: string;
 }
 
 export type MainContextType = {
@@ -42,5 +44,7 @@ export const MainContext = createContext<MainContextType>( {
 		extended_query_prompt_reason: null,
 		file_path_map: {},
 		file_link_format: false,
+		abspath: '',
+		contentpath: '',
 	},
 } );

output/html/block_editor.tsx

@@ -86,6 +86,7 @@ export const BlockEditor = ( { data }: PanelProps<iBlockData> ) => {
 				text={ row.callback.name }
 				file={ row.callback.file || null }
 				line={ row.callback.line || null }
+				expanded
 			/>
 		),
 	};

output/html/concerned_hooks.tsx

@@ -84,6 +84,7 @@ export const ConcernedHooks = ( { data }: PanelProps<AbstractData> ) => {
 								text={ text }
 								file={ row.callback.file || '' }
 								line={ row.callback.line || 0 }
+								expanded
 							/>
 						);
 					},

output/html/hooks.tsx

@@ -138,6 +138,7 @@ export const Hooks = ( { data }: PanelProps<DataTypes['hooks']> ) => {
 								text={ text }
 								file={ row.callback.file || null }
 								line={ row.callback.line || 0 }
+								expanded
 							/>
 						);
 					},

output/html/languages.tsx

@@ -1,5 +1,6 @@
 import { ApproximateSize } from '../components/approximate-size';
 import { FileName } from '../components/file-name';
+import { SourceLocation } from '../components/source-location';
 import { PanelFooter } from '../panels/panel-footer';
 import { TabularPanel } from '../panels/tabular-panel';
 import { DataTypes } from '../data-types';
@@ -32,7 +33,7 @@ export const Languages = ( { data }: PanelProps<DataTypes['languages']> ) => {
 					heading: __( 'Caller', 'query-monitor' ),
 					render: ( row ) => (
 						row.caller ? (
-							<FileName
+							<SourceLocation
 								text={ row.caller.display }
 								file={ row.caller.file }
 								line={ row.caller.line }

output/html/theme.tsx

@@ -153,6 +153,7 @@ export const Theme = ( { data }: PanelProps<DataTypes['response']> ) => {
 								{ data.count_template_parts[ filename ] > 1 && (
 									<span className="qm-info qm-supplemental">
 										<br/>
+										&nbsp;-&nbsp;
 										{ sprintf(
 											/* translators: %s: The number of times that a template part file was included in the page */
 											_nx( 'Included %s time', 'Included %s times', data.count_template_parts[ filename ], 'template parts', 'query-monitor' ),

output/panels/panels.tsx

@@ -56,6 +56,8 @@ export type iSettings = {
 	};
 	file_path_map: Record<string, string>;
 	file_link_format: string | false;
+	abspath: string;
+	contentpath: string;
 };
 
 type Props = {

output/qm.tsx

@@ -124,6 +124,8 @@ export const QM = ( props: Props ) => {
 			extended_query_prompt_reason: props.settings.extended_query_prompt_reason,
 			file_path_map: props.settings.file_path_map,
 			file_link_format: props.settings.file_link_format,
+			abspath: props.settings.abspath,
+			contentpath: props.settings.contentpath,
 		},
 	};