Skip to content

Remove base url from link control search results #54553

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

Merged
getdave merged 14 commits into from
Sep 21, 2023
Merged

Remove base url from link control search results #54553

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
158c841
Expose baseURL setting on Post and Site Editors via block settings
getdave Sep 18, 2023
37e9bb1
Strip baseURL from rendered search results
getdave Sep 18, 2023
25c576a
Only fetch baseURL once in top level component
getdave Sep 18, 2023
bb545d8
Simplify implementation to utilise URL parse functions
getdave Sep 18, 2023
1e95736
Improve comment wording to avoid referencing undefined var
getdave Sep 18, 2023
9b84981
Remove superfluous conditional
getdave Sep 19, 2023
0d12f6f
Decode URL prior to operations
getdave Sep 19, 2023
5808ca7
Refactor for readability
getdave Sep 19, 2023
956152a
Fix where url is not defined
getdave Sep 19, 2023
dd9e6c4
Revert change to filter util
getdave Sep 19, 2023
724bffc
Ensure that filterURLForDisplay always receives a string as an arg
getdave Sep 19, 2023
d2e54f9
Make e2e test locator less strict
getdave Sep 19, 2023
67a4b67
Prefer pipe
getdave Sep 19, 2023
868b3e4
Force remove trailing slash
getdave Sep 21, 2023
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
Next Next commit
Expose baseURL setting on Post and Site Editors via block settings
  • Loading branch information
@getdave
getdave committed Sep 18, 2023
commit 158c841c80145d941b9366cddc606c3ca662bbc2
14 changes: 14 additions & 0 deletions packages/edit-site/src/components/block-editor/use-site-editor-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@ export default function useSiteEditorSettings() {
}, [] );
const archiveLabels = useArchiveLabel( templateSlug );

const { baseURL } = useSelect( ( select ) => {
const { getEntityRecord, canUser } = select( coreStore );

const siteSettings = canUser( 'read', 'settings' )
? getEntityRecord( 'root', 'site' )
: undefined;

return {
baseURL: siteSettings?.url,
};
}, [] );

const blockPatterns = useMemo(
() =>
[
Expand Down Expand Up @@ -174,6 +186,7 @@ export default function useSiteEditorSettings() {
focusMode: canvasMode === 'view' && focusMode ? false : focusMode,
__experimentalArchiveTitleTypeLabel: archiveLabels.archiveTypeLabel,
__experimentalArchiveTitleNameLabel: archiveLabels.archiveNameLabel,
baseURL,
};
}, [
storedSettings,
Expand All @@ -182,5 +195,6 @@ export default function useSiteEditorSettings() {
canvasMode,
archiveLabels.archiveTypeLabel,
archiveLabels.archiveNameLabel,
baseURL,
] );
}
4 changes: 4 additions & 0 deletions packages/editor/src/components/provider/use-block-editor-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
canUseUnfilteredHTML,
userCanCreatePages,
pageOnFront,
baseURL,
postType,
userPatternCategories,
} = useSelect( ( select ) => {
Expand All @@ -118,6 +119,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
hasUploadPermissions: canUser( 'create', 'media' ) ?? true,
userCanCreatePages: canUser( 'create', 'pages' ),
pageOnFront: siteSettings?.page_on_front,
baseURL: siteSettings?.url,
postType: getCurrentPostType(),
userPatternCategories: getUserPatternCategories(),
};
Expand Down Expand Up @@ -213,6 +215,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
__experimentalCreatePageEntity: createPageEntity,
__experimentalUserCanCreatePages: userCanCreatePages,
pageOnFront,
baseURL,
__experimentalPreferPatternsOnRoot: hasTemplate,
} ),
[
Expand All @@ -228,6 +231,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
createPageEntity,
userCanCreatePages,
pageOnFront,
baseURL,
]
);
}
Expand Down