Skip to content

Avoid double encoding of search term #307

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
ofahimIQSS merged 2 commits into from
May 27, 2025
Merged

Avoid double encoding of search term #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fe16cf
fix: avoid encoding again
g-saracca May 27, 2025
30a4a8a
fix: update search terms
g-saracca May 27, 2025
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
10 changes: 2 additions & 8 deletions src/collections/infra/repositories/CollectionsRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,7 @@ export class CollectionsRepository extends ApiRepository implements ICollections
}

if (searchText) {
queryParams.set(
GetMyDataCollectionItemsQueryParams.SEARCH_TEXT,
encodeURIComponent(searchText)
)
queryParams.set(GetMyDataCollectionItemsQueryParams.SEARCH_TEXT, searchText)
}

roleIds.forEach((roleId) => {
Expand Down Expand Up @@ -315,10 +312,7 @@ export class CollectionsRepository extends ApiRepository implements ICollections
collectionSearchCriteria: CollectionSearchCriteria
) {
if (collectionSearchCriteria.searchText) {
queryParams.set(
GetCollectionItemsQueryParams.QUERY,
encodeURIComponent(collectionSearchCriteria.searchText)
)
queryParams.set(GetCollectionItemsQueryParams.QUERY, collectionSearchCriteria.searchText)
}

if (collectionSearchCriteria?.itemTypes) {
Expand Down
35 changes: 18 additions & 17 deletions test/integration/collections/CollectionsRepository.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ describe('CollectionsRepository', () => {
expect(actualFilePreview.fileType).toBe('Plain Text')
expect(actualFilePreview.md5).toBe(expectedFileMd5)
expect(actualFilePreview.name).toBe(expectedFileName)
expect(actualFilePreview.publicationStatuses[0]).toBe(PublicationStatus.Unpublished)
expect(actualFilePreview.publicationStatuses[1]).toBe(PublicationStatus.Draft)
expect(actualFilePreview.publicationStatuses).toContain(PublicationStatus.Unpublished)
expect(actualFilePreview.publicationStatuses).toContain(PublicationStatus.Draft)
expect(actualFilePreview.sizeInBytes).toBe(12)
expect(actualFilePreview.url).not.toBeUndefined()
expect(actualFilePreview.releaseOrCreateDate).not.toBeUndefined()
Expand All @@ -501,8 +501,8 @@ describe('CollectionsRepository', () => {
expect(actualDatasetPreview.description).toBe('This is the description of the dataset.')
expect(actualDatasetPreview.persistentId).not.toBeUndefined()
expect(actualDatasetPreview.persistentId).not.toBeUndefined()
expect(actualDatasetPreview.publicationStatuses[0]).toBe(PublicationStatus.Unpublished)
expect(actualDatasetPreview.publicationStatuses[1]).toBe(PublicationStatus.Draft)
expect(actualDatasetPreview.publicationStatuses).toContain(PublicationStatus.Unpublished)
expect(actualFilePreview.publicationStatuses).toContain(PublicationStatus.Draft)
expect(actualDatasetPreview.versionId).not.toBeUndefined()
expect(actualDatasetPreview.versionInfo.createTime).not.toBeUndefined()
expect(actualDatasetPreview.versionInfo.lastUpdateTime).not.toBeUndefined()
Expand All @@ -521,7 +521,7 @@ describe('CollectionsRepository', () => {
expect(actualCollectionPreview.imageUrl).toBe(undefined)
expect(actualCollectionPreview.parentAlias).toBe(testCollectionAlias)
expect(actualCollectionPreview.parentName).toBe(expectedCollectionsName)
expect(actualCollectionPreview.publicationStatuses[0]).toBe(PublicationStatus.Unpublished)
expect(actualCollectionPreview.publicationStatuses).toContain(PublicationStatus.Unpublished)
expect(actualCollectionPreview.releaseOrCreateDate).not.toBeUndefined()
expect(actualCollectionPreview.affiliation).toBe('Scientific Research University')
expect(actualCollectionPreview.parentAlias).toBe('collectionsRepositoryTestCollection')
Expand Down Expand Up @@ -558,14 +558,15 @@ describe('CollectionsRepository', () => {
expect(actual.countPerObjectType.files).toBe(1)

const collectionSearchCriteriaForDataset = new CollectionSearchCriteria().withSearchText(
'This is the description'
'Dataset created using'
)
actual = await sut.getCollectionItems(
testCollectionAlias,
undefined,
undefined,
collectionSearchCriteriaForDataset
)

expect(actual.totalItemCount).toBe(1)
expect((actual.items[0] as DatasetPreview).title).toBe(expectedDatasetDescription)
expect(actual.countPerObjectType.collections).toBe(0)
Expand Down Expand Up @@ -926,7 +927,7 @@ describe('CollectionsRepository', () => {
expect(actualFilePreview.fileType).toBe('Tab-Delimited')
expect(actualFilePreview.md5).toBe(expectedFileMd5)
expect(actualFilePreview.name).toBe(expectedFileName)
expect(actualFilePreview.publicationStatuses[0]).toBe(PublicationStatus.Published)
expect(actualFilePreview.publicationStatuses).toContain(PublicationStatus.Published)
expect(actualFilePreview.sizeInBytes).toBe(137)
expect(actualFilePreview.url).not.toBeUndefined()
expect(actualFilePreview.releaseOrCreateDate).not.toBeUndefined()
Expand All @@ -943,7 +944,7 @@ describe('CollectionsRepository', () => {
expect(actualDatasetPreview.description).toBe('This is the description of the dataset.')
expect(actualDatasetPreview.persistentId).not.toBeUndefined()
expect(actualDatasetPreview.persistentId).not.toBeUndefined()
expect(actualDatasetPreview.publicationStatuses[0]).toBe(PublicationStatus.Published)
expect(actualDatasetPreview.publicationStatuses).toContain(PublicationStatus.Published)
expect(actualDatasetPreview.versionId).not.toBeUndefined()
expect(actualDatasetPreview.versionInfo.createTime).not.toBeUndefined()
expect(actualDatasetPreview.versionInfo.lastUpdateTime).not.toBeUndefined()
Expand All @@ -962,7 +963,7 @@ describe('CollectionsRepository', () => {
expect(actualCollectionPreview.imageUrl).toBe(undefined)
expect(actualCollectionPreview.parentAlias).toBe(testCollectionAlias)
expect(actualCollectionPreview.parentName).toBe(expectedCollectionsName)
expect(actualCollectionPreview.publicationStatuses[0]).toBe(PublicationStatus.Published)
expect(actualCollectionPreview.publicationStatuses).toContain(PublicationStatus.Published)
expect(actualCollectionPreview.releaseOrCreateDate).not.toBeUndefined()
expect(actualCollectionPreview.affiliation).toBe('Scientific Research University')
expect(actualCollectionPreview.parentAlias).toBe('collectionsRepositoryTestCollection')
Expand Down Expand Up @@ -1356,8 +1357,7 @@ describe('CollectionsRepository', () => {
TestConstants.TEST_NEW_DATASET_DTO,
testSubCollectionAlias
)
} catch (error: any) {
console.log(error.message)
} catch {
throw new Error('Tests beforeAll(): Error while creating test dataset')
}
await uploadFileViaApi(testDatasetIds.numericId, testTextFile1Name).catch(() => {
Expand Down Expand Up @@ -1451,8 +1451,8 @@ describe('CollectionsRepository', () => {
expect(actualFilePreview.fileType).toBe('Plain Text')
expect(actualFilePreview.md5).toBe(expectedFileMd5)
expect(actualFilePreview.name).toBe(expectedFileName)
expect(actualFilePreview.publicationStatuses[0]).toBe(PublicationStatus.Unpublished)
expect(actualFilePreview.publicationStatuses[1]).toBe(PublicationStatus.Draft)
expect(actualFilePreview.publicationStatuses).toContain(PublicationStatus.Unpublished)
expect(actualFilePreview.publicationStatuses).toContain(PublicationStatus.Draft)
expect(actualFilePreview.sizeInBytes).toBe(12)
expect(actualFilePreview.url).not.toBeUndefined()
expect(actualFilePreview.releaseOrCreateDate).not.toBeUndefined()
Expand All @@ -1465,8 +1465,8 @@ describe('CollectionsRepository', () => {
expect(actualDatasetPreview.description).toBe('This is the description of the dataset.')
expect(actualDatasetPreview.persistentId).not.toBeUndefined()
expect(actualDatasetPreview.persistentId).not.toBeUndefined()
expect(actualDatasetPreview.publicationStatuses[0]).toBe(PublicationStatus.Unpublished)
expect(actualDatasetPreview.publicationStatuses[1]).toBe(PublicationStatus.Draft)
expect(actualDatasetPreview.publicationStatuses).toContain(PublicationStatus.Unpublished)
expect(actualDatasetPreview.publicationStatuses).toContain(PublicationStatus.Draft)
expect(actualDatasetPreview.versionId).not.toBeUndefined()
expect(actualDatasetPreview.versionInfo.createTime).not.toBeUndefined()
expect(actualDatasetPreview.versionInfo.lastUpdateTime).not.toBeUndefined()
Expand All @@ -1485,7 +1485,7 @@ describe('CollectionsRepository', () => {
expect(actualCollectionPreview.imageUrl).toBe(undefined)
expect(actualCollectionPreview.parentAlias).toBe(testCollectionAlias)
expect(actualCollectionPreview.parentName).toBe(testCollectionName)
expect(actualCollectionPreview.publicationStatuses[0]).toBe(PublicationStatus.Unpublished)
expect(actualCollectionPreview.publicationStatuses).toContain(PublicationStatus.Unpublished)
expect(actualCollectionPreview.releaseOrCreateDate).not.toBeUndefined()
expect(actualCollectionPreview.affiliation).toBe('test affiliation')
expect(actualCollectionPreview.type).toBe(CollectionItemType.COLLECTION)
Expand Down Expand Up @@ -1521,7 +1521,7 @@ describe('CollectionsRepository', () => {
expect(actualFileResult.countPerObjectType.datasets).toBe(0)
expect(actualFileResult.countPerObjectType.files).toBe(1)

const datasetSearchText = 'This is the description'
const datasetSearchText = 'of the dataset.'

actual = await sut.getMyDataCollectionItems(
roleIds,
Expand All @@ -1531,6 +1531,7 @@ describe('CollectionsRepository', () => {
undefined,
datasetSearchText
)

expect(actual.totalItemCount).toBe(1)
expect((actual.items[0] as DatasetPreview).title).toBe(expectedDatasetDescription)
expect(actual.countPerObjectType.collections).toBe(0)
Expand Down