summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranoy <anoymouserver+github@mailbox.org>2023-11-04 20:49:49 +0100
committeranoy <anoymouserver+github@mailbox.org>2023-11-04 21:19:05 +0100
commitc5bac6c2cd03b67b2f303c1b47e556b839639faf (patch)
tree7d47391bfb85be3b3bd3bf4cb1c148788b7e6ca1
parented595a666d7b72275048dd3ce7f0967c4c1569d8 (diff)
adjust search urls to match changed Vue routesfix-search-routes
Signed-off-by: anoy <anoymouserver+github@mailbox.org>
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/Search/FeedSearchProvider.php2
-rw-r--r--lib/Search/FolderSearchProvider.php2
-rw-r--r--lib/Search/ItemSearchProvider.php4
-rw-r--r--tests/Unit/Search/FeedSearchProviderTest.php2
-rw-r--r--tests/Unit/Search/FolderSearchProviderTest.php2
-rw-r--r--tests/Unit/Search/ItemSearchProviderTest.php6
7 files changed, 10 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90504d184..c0c6a2da2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
### Changed
### Fixed
+- Adjust search urls to match changed Vue routes (#2408)
# Releases
## [25.0.0-alpha1] - 2023-10-24
diff --git a/lib/Search/FeedSearchProvider.php b/lib/Search/FeedSearchProvider.php
index 36b21eaba..890692efc 100644
--- a/lib/Search/FeedSearchProvider.php
+++ b/lib/Search/FeedSearchProvider.php
@@ -70,7 +70,7 @@ class FeedSearchProvider implements IProvider
$this->urlGenerator->imagePath('core', 'rss.svg'),
$feed->getTitle(),
$this->l10n->t('Unread articles') . ': ' . $feed->getUnreadCount(),
- $this->urlGenerator->linkToRoute('news.page.index') . '#/items/feeds/' . $feed->getId()
+ $this->urlGenerator->linkToRoute('news.page.index') . '#/feed/' . $feed->getId()
);
}
diff --git a/lib/Search/FolderSearchProvider.php b/lib/Search/FolderSearchProvider.php
index 7f6783c68..315ac016f 100644
--- a/lib/Search/FolderSearchProvider.php
+++ b/lib/Search/FolderSearchProvider.php
@@ -71,7 +71,7 @@ class FolderSearchProvider implements IProvider
$this->urlGenerator->imagePath('core', 'filetypes/folder.svg'),
$folder->getName(),
'',
- $this->urlGenerator->linkToRoute('news.page.index') . '#/items/folders/' . $folder->getId()
+ $this->urlGenerator->linkToRoute('news.page.index') . '#/folder/' . $folder->getId()
);
}
diff --git a/lib/Search/ItemSearchProvider.php b/lib/Search/ItemSearchProvider.php
index 29b4bf209..1c0cb4a06 100644
--- a/lib/Search/ItemSearchProvider.php
+++ b/lib/Search/ItemSearchProvider.php
@@ -94,13 +94,13 @@ class ItemSearchProvider implements IProvider
}
$icon = $this->urlGenerator->imagePath('core', 'filetypes/text.svg');
-
+
foreach ($search_result as $item) {
$list[] = new SearchResultEntry(
$icon,
$item->getTitle(),
$this->stripTruncate($item->getBody(), 50),
- $this->urlGenerator->linkToRoute('news.page.index') . '#/items/feeds/' . $item->getFeedId()
+ $this->urlGenerator->linkToRoute('news.page.index') . '#/feed/' . $item->getFeedId()
);
}
diff --git a/tests/Unit/Search/FeedSearchProviderTest.php b/tests/Unit/Search/FeedSearchProviderTest.php
index e1463a7a7..7b67cfdbc 100644
--- a/tests/Unit/Search/FeedSearchProviderTest.php
+++ b/tests/Unit/Search/FeedSearchProviderTest.php
@@ -125,6 +125,6 @@ class FeedSearchProviderTest extends TestCase
$this->assertSame('some_tErm', $entry['title']);
$this->assertSame('folderpath.svg', $entry['thumbnailUrl']);
$this->assertSame('Unread articles: 1', $entry['subline']);
- $this->assertSame('/news#/items/feeds/1', $entry['resourceUrl']);
+ $this->assertSame('/news#/feed/1', $entry['resourceUrl']);
}
}
diff --git a/tests/Unit/Search/FolderSearchProviderTest.php b/tests/Unit/Search/FolderSearchProviderTest.php
index e06bf45f7..ce692dedc 100644
--- a/tests/Unit/Search/FolderSearchProviderTest.php
+++ b/tests/Unit/Search/FolderSearchProviderTest.php
@@ -127,6 +127,6 @@ class FolderSearchProviderTest extends TestCase
$this->assertSame('some_tErm', $entry['title']);
$this->assertSame('folderpath.svg', $entry['thumbnailUrl']);
$this->assertSame('', $entry['subline']);
- $this->assertSame('/news#/items/folders/1', $entry['resourceUrl']);
+ $this->assertSame('/news#/folder/1', $entry['resourceUrl']);
}
}
diff --git a/tests/Unit/Search/ItemSearchProviderTest.php b/tests/Unit/Search/ItemSearchProviderTest.php
index 062d52a77..c50e32a59 100644
--- a/tests/Unit/Search/ItemSearchProviderTest.php
+++ b/tests/Unit/Search/ItemSearchProviderTest.php
@@ -93,7 +93,7 @@ class ItemSearchProviderTest extends TestCase
$query->expects($this->once())
->method('getLimit')
->willReturn(10);
-
+
$user->expects($this->once())
->method('getUID')
->willReturn('user');
@@ -101,7 +101,7 @@ class ItemSearchProviderTest extends TestCase
$query->expects($this->once())
->method('getTerm')
->willReturn('some text');
-
+
$items = [
Item::fromRow(['id' => 1,'title' => 'some_tErm', 'body' => 'some text', 'feedId' => 1]),
@@ -142,6 +142,6 @@ class ItemSearchProviderTest extends TestCase
$this->assertSame('some_tErm', $entry['title']);
$this->assertSame('folderpath.svg', $entry['thumbnailUrl']);
$this->assertSame('some text', $entry['subline']);
- $this->assertSame('/news#/items/feeds/1', $entry['resourceUrl']);
+ $this->assertSame('/news#/feed/1', $entry['resourceUrl']);
}
}