diff --git a/api-gateway/src/api/service/schema.ts b/api-gateway/src/api/service/schema.ts index a002f47a03..83da9d8d39 100644 --- a/api-gateway/src/api/service/schema.ts +++ b/api-gateway/src/api/service/schema.ts @@ -417,6 +417,14 @@ export class SchemaApi { required: false, example: 'text' }) + @ApiQuery({ + name: 'searchOptions', + type: String, + description: 'Search Options', + required: false, + isArray: true, + example: 'name' + }) @ApiOkResponse({ description: 'Successful operation.', isArray: true, @@ -440,6 +448,7 @@ export class SchemaApi { @Query('toolId') toolId: string, @Query('topicId') topicId: string, @Query('search') search: string, + @Query('searchOptions') searchOptions: string[] | string, @Response() res: any ): Promise { try { @@ -468,6 +477,13 @@ export class SchemaApi { if (search) { options.search = search; } + if (searchOptions) { + if (Array.isArray(searchOptions)) { + options.searchOptions = searchOptions; + } else if (typeof searchOptions === 'string') { + options.searchOptions = searchOptions.split(','); + } + } options.fields = Object.values(SCHEMA_REQUIRED_PROPS) const { items, count } = await guardians.getSchemasByOwnerV2(options, owner); diff --git a/frontend/src/app/services/schema.service.ts b/frontend/src/app/services/schema.service.ts index 8571ba7ebb..dc60ec49a8 100644 --- a/frontend/src/app/services/schema.service.ts +++ b/frontend/src/app/services/schema.service.ts @@ -104,6 +104,7 @@ export class SchemaService { category?: SchemaCategory, topicId?: string, search?: string, + searchOptions?: string[], pageIndex?: number, pageSize?: number | string, }): Observable> { diff --git a/frontend/src/app/views/schemas/schemas.component.html b/frontend/src/app/views/schemas/schemas.component.html index ac7aee6891..4265e824fc 100644 --- a/frontend/src/app/views/schemas/schemas.component.html +++ b/frontend/src/app/views/schemas/schemas.component.html @@ -63,6 +63,19 @@
+ + tr > th { +.p-treetable .p-treetable-thead>tr>th { padding: 0; } @@ -817,10 +846,12 @@ a { background-color: var(--color-grey-white, #FFF); border-top-left-radius: 8px; border-top-right-radius: 8px; + &:first-child { border-top-left-radius: 8px; border-top-right-radius: 8px; } + &:last-child { border-top-right-radius: 8px; } @@ -882,4 +913,4 @@ a { } } } -} +} \ No newline at end of file diff --git a/frontend/src/app/views/schemas/schemas.component.ts b/frontend/src/app/views/schemas/schemas.component.ts index 20a6ccf320..5414bc8e60 100644 --- a/frontend/src/app/views/schemas/schemas.component.ts +++ b/frontend/src/app/views/schemas/schemas.component.ts @@ -130,6 +130,16 @@ export class SchemaConfigComponent implements OnInit { { label: 'System Schemas', value: SchemaType.System } ]; public textSearch: any; + public textSearchOptionsValue: string[] = [ + 'uuid', 'name', 'description', 'references', 'fields' + ]; + public textSearchOptions: { label: string; value: string }[] = [ + { label: 'UUID', value: 'uuid' }, + { label: 'Name', value: 'name' }, + { label: 'Description', value: 'description' }, + { label: 'References', value: 'references' }, + { label: 'Fields', value: 'fields' }, + ]; public element: any = {}; @@ -616,6 +626,7 @@ export class SchemaConfigComponent implements OnInit { category, topicId: this.currentTopic || '', search: this.textSearch, + searchOptions: this.textSearchOptionsValue, pageIndex: this.pageIndex, pageSize: this.pageSize }); diff --git a/guardian-service/src/api/schema.service.ts b/guardian-service/src/api/schema.service.ts index 2f7bedf5d2..2ced6a3e0e 100644 --- a/guardian-service/src/api/schema.service.ts +++ b/guardian-service/src/api/schema.service.ts @@ -586,8 +586,8 @@ export async function schemaAPI(logger: PinoLogger): Promise { } const [items, count] = await DatabaseServer.getSchemasAndCount(filter, otherOptions); const pipeline = [ - {$match: filter}, - {$group: {_id: '$topicId', count: {$sum: 1}}} + { $match: filter }, + { $group: { _id: '$topicId', count: { $sum: 1 } } } ] as unknown[]; const countByTopic = await new DataBaseHelper(SchemaCollection).aggregate(pipeline) as unknown[] as { _id: string, count: number }[]; items.forEach((item) => { @@ -619,6 +619,7 @@ export async function schemaAPI(logger: PinoLogger): Promise { toolId?: string, topicId?: string, search?: string + searchOptions?: string[] }, owner: IOwner, }) => { @@ -708,27 +709,63 @@ export async function schemaAPI(logger: PinoLogger): Promise { //search if (options.search) { let search = options.search.toLowerCase(); - let global = false; - if (search.startsWith('@')) { - global = true; + if (search.startsWith('@') || search.startsWith('#')) { search = search.substring(1); } + const searchOptions = options.searchOptions || ['uuid', 'name', 'description', 'references', 'fields']; + const fields = ['_id']; + if (searchOptions.includes('uuid')) { + fields.push('iri'); + } + if (searchOptions.includes('name')) { + fields.push('name'); + } + if (searchOptions.includes('description')) { + fields.push('description'); + } + if (searchOptions.includes('references') || searchOptions.includes('fields')) { + fields.push('documentFileId'); + } let schemas = await DatabaseServer.getSchemas(filter, { orderBy: { createDate: 'DESC' }, limit: 10000, offset: 0, - fields: ['_id', 'documentFileId'] + fields }); schemas = schemas.filter((s) => { - if (s.document) { - if (!global) { + if (searchOptions.includes('uuid')) { + if (s.iri && s.iri.toLowerCase().includes(search)) { + return true; + } + } + if (searchOptions.includes('name')) { + if (s.name && s.name.toLowerCase().includes(search)) { + return true; + } + } + if (searchOptions.includes('description')) { + if (s.description && s.description.toLowerCase().includes(search)) { + return true; + } + } + if (searchOptions.includes('references')) { + if (s.document?.$defs) { + const text = JSON.stringify(s.document.$defs).toLowerCase(); + if (text.includes(search)) { + return true; + } + } + } + if (searchOptions.includes('fields')) { + if (s.document) { delete s.document.$defs; + const text = JSON.stringify(s.document).toLowerCase(); + if (text.includes(search)) { + return true; + } } - const text = JSON.stringify(s.document).toLowerCase(); - return text.indexOf(search) > -1; - } else { - return false; } + return false; }) const ids = schemas.map((s) => s._id); filter._id = { $in: ids }; @@ -736,8 +773,8 @@ export async function schemaAPI(logger: PinoLogger): Promise { const [items, count] = await DatabaseServer.getSchemasAndCount(filter, otherOptions); const pipeline = [ - {$match: filter}, - {$group: {_id: '$topicId', count: {$sum: 1}}} + { $match: filter }, + { $group: { _id: '$topicId', count: { $sum: 1 } } } ] as unknown[]; const countByTopic = await new DataBaseHelper(SchemaCollection).aggregate(pipeline) as unknown[] as { _id: string, count: number }[]; items.forEach((item) => { diff --git a/swagger.yaml b/swagger.yaml index 98cd9e397a..340fe87939 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -9325,6 +9325,15 @@ paths: schema: example: text type: string + - name: searchOptions + required: false + in: query + description: Search Options + schema: + example: name + type: array + items: + type: string responses: '200': description: Successful operation.