mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-05-12 17:04:46 +00:00
GH Auto: Upstream dependencies ADF:8.1.0-14660630465 JS-API:9.1.0-14660630465 using Tag:8.1.0-14660630465 (#4533)
* [ci:force][auto-commit] Update dependencies ADF:8.1.0-14660630465 JS:9.1.0-14660630465 * [ACS-9564] Fix rendering of Knowledge Retrieval answer after change in answer structure * incease viewer load time waiting * exclude test XAT-5470 ACS-9580 --------- Co-authored-by: DenysVuika <503991+DenysVuika@users.noreply.github.com> Co-authored-by: Aleksander Sklorz <Aleksander.Sklorz@hyland.com> Co-authored-by: akashrathod28 <akash.rathod@hyland.com>
This commit is contained in:
parent
ba1ef44fdf
commit
680b11ba2e
@ -2,5 +2,6 @@
|
|||||||
"XAT-17181": "https://hyland.atlassian.net/browse/ACS-8865",
|
"XAT-17181": "https://hyland.atlassian.net/browse/ACS-8865",
|
||||||
"XAT-17182": "https://hyland.atlassian.net/browse/ACS-8865",
|
"XAT-17182": "https://hyland.atlassian.net/browse/ACS-8865",
|
||||||
"XAT-17184": "https://hyland.atlassian.net/browse/ACS-8865",
|
"XAT-17184": "https://hyland.atlassian.net/browse/ACS-8865",
|
||||||
"XAT-17185": "https://hyland.atlassian.net/browse/ACS-8865"
|
"XAT-17185": "https://hyland.atlassian.net/browse/ACS-8865",
|
||||||
|
"XAT-5470": "https://hyland.atlassian.net/browse/ACS-9580"
|
||||||
}
|
}
|
||||||
|
60
package-lock.json
generated
60
package-lock.json
generated
@ -9,11 +9,11 @@
|
|||||||
"version": "7.0.0",
|
"version": "7.0.0",
|
||||||
"license": "LGPL-3.0",
|
"license": "LGPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alfresco/adf-content-services": "8.1.0-14605928703",
|
"@alfresco/adf-content-services": "8.1.0-14660630465",
|
||||||
"@alfresco/adf-core": "8.1.0-14605928703",
|
"@alfresco/adf-core": "8.1.0-14660630465",
|
||||||
"@alfresco/adf-extensions": "8.1.0-14605928703",
|
"@alfresco/adf-extensions": "8.1.0-14660630465",
|
||||||
"@alfresco/eslint-plugin-eslint-angular": "8.1.0-14605928703",
|
"@alfresco/eslint-plugin-eslint-angular": "8.1.0-14660630465",
|
||||||
"@alfresco/js-api": "9.1.0-14605928703",
|
"@alfresco/js-api": "9.1.0-14660630465",
|
||||||
"@angular/animations": "17.1.3",
|
"@angular/animations": "17.1.3",
|
||||||
"@angular/cdk": "17.1.2",
|
"@angular/cdk": "17.1.2",
|
||||||
"@angular/common": "17.1.3",
|
"@angular/common": "17.1.3",
|
||||||
@ -45,7 +45,7 @@
|
|||||||
"zone.js": "0.14.8"
|
"zone.js": "0.14.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@alfresco/adf-cli": "8.1.0-14605928703",
|
"@alfresco/adf-cli": "8.1.0-14660630465",
|
||||||
"@angular-devkit/build-angular": "17.3.16",
|
"@angular-devkit/build-angular": "17.3.16",
|
||||||
"@angular-devkit/core": "17.1.4",
|
"@angular-devkit/core": "17.1.4",
|
||||||
"@angular-devkit/schematics": "17.1.4",
|
"@angular-devkit/schematics": "17.1.4",
|
||||||
@ -111,13 +111,13 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@alfresco/adf-cli": {
|
"node_modules/@alfresco/adf-cli": {
|
||||||
"version": "8.1.0-14605928703",
|
"version": "8.1.0-14660630465",
|
||||||
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-8.1.0-14605928703.tgz",
|
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-8.1.0-14660630465.tgz",
|
||||||
"integrity": "sha512-GYJkf2vlT7HVpFgDUVLbTF7TY9b3Mc2tcdY34RNvxfC8MxszPjAtbh0sIg0kmkgH7UDKShEF61z3rEPsx9gJCg==",
|
"integrity": "sha512-oVr/wuqTsL8IQLt2xvrZOTdUQwCsJhbQLTxyeiLoaCn52EDEbTHNtHWFoI4NpUbQUjAP6NoIadd+IHMNWvxyew==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alfresco/js-api": ">=9.1.0-14605928703",
|
"@alfresco/js-api": ">=9.1.0-14660630465",
|
||||||
"commander": "^6.2.1",
|
"commander": "^6.2.1",
|
||||||
"ejs": "^3.1.9",
|
"ejs": "^3.1.9",
|
||||||
"license-checker": "^25.0.1",
|
"license-checker": "^25.0.1",
|
||||||
@ -152,16 +152,16 @@
|
|||||||
"license": "0BSD"
|
"license": "0BSD"
|
||||||
},
|
},
|
||||||
"node_modules/@alfresco/adf-content-services": {
|
"node_modules/@alfresco/adf-content-services": {
|
||||||
"version": "8.1.0-14605928703",
|
"version": "8.1.0-14660630465",
|
||||||
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-8.1.0-14605928703.tgz",
|
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-8.1.0-14660630465.tgz",
|
||||||
"integrity": "sha512-LGHRqx3cJ5rfUYktWGJuiH99jl6Ulkz31KpFEpQwABPnLjSAo8tDSx0ds5XKG9CJVakcNVtkPUWSb6OD0PETxw==",
|
"integrity": "sha512-gpZoTivK6jG+PJFA/vLgqT2j4svZpQayD77pryX1QouG+1VQR2an/6+eoh7siWQqfEeCXkprtIW2eCCjokBeMQ==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@alfresco/adf-core": ">=8.1.0-14605928703",
|
"@alfresco/adf-core": ">=8.1.0-14660630465",
|
||||||
"@alfresco/js-api": ">=9.1.0-14605928703",
|
"@alfresco/js-api": ">=9.1.0-14660630465",
|
||||||
"@angular/animations": ">=14.1.3",
|
"@angular/animations": ">=14.1.3",
|
||||||
"@angular/cdk": ">=14.1.2",
|
"@angular/cdk": ">=14.1.2",
|
||||||
"@angular/common": ">=14.1.3",
|
"@angular/common": ">=14.1.3",
|
||||||
@ -176,9 +176,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@alfresco/adf-core": {
|
"node_modules/@alfresco/adf-core": {
|
||||||
"version": "8.1.0-14605928703",
|
"version": "8.1.0-14660630465",
|
||||||
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-8.1.0-14605928703.tgz",
|
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-8.1.0-14660630465.tgz",
|
||||||
"integrity": "sha512-DmEtKVKv8j6+K1bHU1fH45uKmNXixxkXrPtCHxaRQf3FQec03NkTPXt/kUUWICgvmX9RwHij8kNwJ64Jsn/+6A==",
|
"integrity": "sha512-sLZ8ewFbQPxsmuz66m7k1+XNhl3Fgz9LYCEXubC8GghhdVewHa8yWODkhJpLmljnK/pc+rXTgPwEBxqA/9zPKA==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"angular-oauth2-oidc": "17.0.2",
|
"angular-oauth2-oidc": "17.0.2",
|
||||||
@ -189,8 +189,8 @@
|
|||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@alfresco/adf-extensions": ">=8.1.0-14605928703",
|
"@alfresco/adf-extensions": ">=8.1.0-14660630465",
|
||||||
"@alfresco/js-api": ">=9.1.0-14605928703",
|
"@alfresco/js-api": ">=9.1.0-14660630465",
|
||||||
"@angular/animations": ">=16.0.0",
|
"@angular/animations": ">=16.0.0",
|
||||||
"@angular/cdk": ">=16.0.0",
|
"@angular/cdk": ">=16.0.0",
|
||||||
"@angular/common": ">=16.0.0",
|
"@angular/common": ">=16.0.0",
|
||||||
@ -208,29 +208,29 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@alfresco/adf-extensions": {
|
"node_modules/@alfresco/adf-extensions": {
|
||||||
"version": "8.1.0-14605928703",
|
"version": "8.1.0-14660630465",
|
||||||
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-8.1.0-14605928703.tgz",
|
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-8.1.0-14660630465.tgz",
|
||||||
"integrity": "sha512-+3n2FDzjvlzMM42ZLwAdHcOeeaovMP1sH+Bj0t3qaY3lttE7j7i4nbESESHgrYWjaIzXGCttVRXEatBNzRMg5w==",
|
"integrity": "sha512-fweC0+BE0hwFjY/KWXCEqFgwJL5dyFVp4gt2NcAz+S+Bcgk7GclzeNce0Gc6Tz13rRRonE8MnOwi8aowBQ9A7Q==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@alfresco/js-api": ">=9.1.0-14605928703",
|
"@alfresco/js-api": ">=9.1.0-14660630465",
|
||||||
"@angular/common": ">=14.1.3",
|
"@angular/common": ">=14.1.3",
|
||||||
"@angular/core": ">=14.1.3"
|
"@angular/core": ">=14.1.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@alfresco/eslint-plugin-eslint-angular": {
|
"node_modules/@alfresco/eslint-plugin-eslint-angular": {
|
||||||
"version": "8.1.0-14605928703",
|
"version": "8.1.0-14660630465",
|
||||||
"resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-8.1.0-14605928703.tgz",
|
"resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-8.1.0-14660630465.tgz",
|
||||||
"integrity": "sha512-CEuXOiDr/RxaEjD+Rzvt0zbMdT73I0OKKztQCaoJq7PsbrZd6Ol6EJ/bOcPpwIMSF5up+FDTk7bAa/prP+AWFg==",
|
"integrity": "sha512-2MBOSBqMZrIsiJ998p0luTVgpAysSSnQmaK2x2hW25Cp3HD/tEmTMXyZ9ljcb4vj+VOoEoEvjIGsyId1OVgF6g==",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/@alfresco/js-api": {
|
"node_modules/@alfresco/js-api": {
|
||||||
"version": "9.1.0-14605928703",
|
"version": "9.1.0-14660630465",
|
||||||
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-9.1.0-14605928703.tgz",
|
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-9.1.0-14660630465.tgz",
|
||||||
"integrity": "sha512-uRv5LZcetNUsDt/rWmXmnt+MznwVQo407PpODwX/yQl81x/JFcMO6i4Sg3QedudfIEd+P688wUBAaNUXbNUnxw==",
|
"integrity": "sha512-+oFNaNw1X1wY4PfkiK4oXxu244ji1BvxkVaELo9BpM5Tav6xsdBq8QGnQ0+0y2De1ZkP1NWDW1bW7WjsZTGZqg==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"event-emitter": "^0.3.5",
|
"event-emitter": "^0.3.5",
|
||||||
|
12
package.json
12
package.json
@ -30,11 +30,11 @@
|
|||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alfresco/adf-content-services": "8.1.0-14605928703",
|
"@alfresco/adf-content-services": "8.1.0-14660630465",
|
||||||
"@alfresco/adf-core": "8.1.0-14605928703",
|
"@alfresco/adf-core": "8.1.0-14660630465",
|
||||||
"@alfresco/adf-extensions": "8.1.0-14605928703",
|
"@alfresco/adf-extensions": "8.1.0-14660630465",
|
||||||
"@alfresco/eslint-plugin-eslint-angular": "8.1.0-14605928703",
|
"@alfresco/eslint-plugin-eslint-angular": "8.1.0-14660630465",
|
||||||
"@alfresco/js-api": "9.1.0-14605928703",
|
"@alfresco/js-api": "9.1.0-14660630465",
|
||||||
"@angular/animations": "17.1.3",
|
"@angular/animations": "17.1.3",
|
||||||
"@angular/cdk": "17.1.2",
|
"@angular/cdk": "17.1.2",
|
||||||
"@angular/common": "17.1.3",
|
"@angular/common": "17.1.3",
|
||||||
@ -66,7 +66,7 @@
|
|||||||
"zone.js": "0.14.8"
|
"zone.js": "0.14.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@alfresco/adf-cli": "8.1.0-14605928703",
|
"@alfresco/adf-cli": "8.1.0-14660630465",
|
||||||
"@angular-devkit/build-angular": "17.3.16",
|
"@angular-devkit/build-angular": "17.3.16",
|
||||||
"@angular-devkit/core": "17.1.4",
|
"@angular-devkit/core": "17.1.4",
|
||||||
"@angular-devkit/schematics": "17.1.4",
|
"@angular-devkit/schematics": "17.1.4",
|
||||||
|
@ -46,7 +46,14 @@ import { searchAiMarkedOptions } from './search-ai-marked-options';
|
|||||||
|
|
||||||
const questionMock: QuestionModel = { question: 'test', questionId: 'testId', restrictionQuery: { nodesIds: [] } };
|
const questionMock: QuestionModel = { question: 'test', questionId: 'testId', restrictionQuery: { nodesIds: [] } };
|
||||||
const getAiAnswerEntry = (noAnswer?: boolean): AiAnswerEntry => {
|
const getAiAnswerEntry = (noAnswer?: boolean): AiAnswerEntry => {
|
||||||
return { entry: { answer: noAnswer ? '' : 'Some answer', questionId: 'some id', references: [] } };
|
return {
|
||||||
|
entry: {
|
||||||
|
answer: noAnswer ? '' : 'Some answer',
|
||||||
|
question: 'some question',
|
||||||
|
objectReferences: [],
|
||||||
|
complete: true
|
||||||
|
}
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
describe('SearchAiResultsComponent', () => {
|
describe('SearchAiResultsComponent', () => {
|
||||||
@ -512,7 +519,12 @@ describe('SearchAiResultsComponent', () => {
|
|||||||
spyOn(userPreferencesService, 'set');
|
spyOn(userPreferencesService, 'set');
|
||||||
spyOn(userPreferencesService, 'get').and.returnValue(knowledgeRetrievalNodes);
|
spyOn(userPreferencesService, 'get').and.returnValue(knowledgeRetrievalNodes);
|
||||||
const answer = getAiAnswerEntry();
|
const answer = getAiAnswerEntry();
|
||||||
answer.entry.references = [{ referenceId: nodeId, referenceText: 'some text' }];
|
answer.entry.objectReferences = [
|
||||||
|
{
|
||||||
|
objectId: nodeId,
|
||||||
|
references: []
|
||||||
|
}
|
||||||
|
];
|
||||||
spyOn(searchAiService, 'getAnswer').and.returnValues(throwError('error'), of(answer));
|
spyOn(searchAiService, 'getAnswer').and.returnValues(throwError('error'), of(answer));
|
||||||
mockQueryParams.next({ query: 'test', agentId: 'agentId1' });
|
mockQueryParams.next({ query: 'test', agentId: 'agentId1' });
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ export class SearchAiResultsComponent extends PageComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
this.queryAnswer = response.entry;
|
this.queryAnswer = response.entry;
|
||||||
this._displayedAnswer = this.preprocessMarkdownFormat(response.entry.answer);
|
this._displayedAnswer = this.preprocessMarkdownFormat(response.entry.answer);
|
||||||
return forkJoin(this.queryAnswer.references.map((reference) => this.nodesApiService.getNode(reference.referenceId)));
|
return forkJoin(this.queryAnswer.objectReferences.map((reference) => this.nodesApiService.getNode(reference.objectId)));
|
||||||
}),
|
}),
|
||||||
retryWhen((errors: Observable<Error>) => this.aiSearchRetryWhen(errors)),
|
retryWhen((errors: Observable<Error>) => this.aiSearchRetryWhen(errors)),
|
||||||
finalize(() => (this._loading = false)),
|
finalize(() => (this._loading = false)),
|
||||||
|
@ -67,7 +67,7 @@ export class ViewerComponent extends BaseComponent {
|
|||||||
if (waitForViewerContent) {
|
if (waitForViewerContent) {
|
||||||
await this.waitForViewerLoaderToFinish();
|
await this.waitForViewerLoaderToFinish();
|
||||||
}
|
}
|
||||||
await this.viewerLocator.waitFor({ state: 'visible', timeout: timeouts.medium });
|
await this.viewerLocator.waitFor({ state: 'visible', timeout: timeouts.large });
|
||||||
}
|
}
|
||||||
|
|
||||||
async isViewerOpened(): Promise<boolean> {
|
async isViewerOpened(): Promise<boolean> {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user