Skip to content

Commit

Permalink
Merge branch 'develop' into ACS-8160-ACA-Update-tag-component
Browse files Browse the repository at this point in the history
  • Loading branch information
tamaragruszka committed Sep 24, 2024
2 parents afa22ff + 3d25eb7 commit 3ecaae8
Show file tree
Hide file tree
Showing 68 changed files with 3,819 additions and 291 deletions.
3 changes: 2 additions & 1 deletion app/src/app.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"contentService": true,
"folderRules": true,
"tagsEnabled": true,
"categoriesEnabled": true
"categoriesEnabled": true,
"knowledgeRetrievalEnabled": false
},
"oauth2": {
"host": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
Expand Down
Binary file added app/src/assets/images/avatars/Blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/assets/images/avatars/Gold.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/assets/images/avatars/Pink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions docker/docker-entrypoint.d/30-sed-on-appconfig.sh
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,8 @@ if [ -n "${APP_CONFIG_PLUGIN_CATEGORIES}" ]; then
echo "SET APP_CONFIG_PLUGIN_CATEGORIES"
sed -e "s/\"categoriesEnabled\": [^,]*/\"categoriesEnabled\": ${APP_CONFIG_PLUGIN_CATEGORIES}/g" -i "$APP_CONFIG_FILE"
fi

if [ -n "${APP_CONFIG_PLUGIN_KNOWLEDGE_RETRIEVAL}" ]; then
echo "SET APP_CONFIG_PLUGIN_KNOWLEDGE_RETRIEVAL"
sed -e "s/\"knowledgeRetrievalEnabled\": [^,]*/\"knowledgeRetrievalEnabled\": ${APP_CONFIG_PLUGIN_KNOWLEDGE_RETRIEVAL}/g" -i "$APP_CONFIG_FILE"
fi
14 changes: 13 additions & 1 deletion e2e/playwright/copy-move-actions/exclude.tests.json
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
{}
{
"C217135": "https://hyland.atlassian.net/browse/ACS-8812",
"C291888": "https://hyland.atlassian.net/browse/ACS-8812",
"C291889": "https://hyland.atlassian.net/browse/ACS-8812",
"C217137": "https://hyland.atlassian.net/browse/ACS-8812",
"C217138": "https://hyland.atlassian.net/browse/ACS-8812",
"C217139": "https://hyland.atlassian.net/browse/ACS-8812",
"C217140": "https://hyland.atlassian.net/browse/ACS-8812",
"C217171": "https://hyland.atlassian.net/browse/ACS-8812",
"C217172": "https://hyland.atlassian.net/browse/ACS-8812",
"C217173": "https://hyland.atlassian.net/browse/ACS-8812",
"C217174": "https://hyland.atlassian.net/browse/ACS-8812"
}
17 changes: 16 additions & 1 deletion e2e/playwright/delete-actions/exclude.tests.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
{
"C280502": "https://hyland.atlassian.net/browse/ACS-8200"
"C217125": "https://hyland.atlassian.net/browse/ACS-8812",
"C217129": "https://hyland.atlassian.net/browse/ACS-8812",
"C217091": "https://hyland.atlassian.net/browse/ACS-8812",
"C280416": "https://hyland.atlassian.net/browse/ACS-8812",
"C290103": "https://hyland.atlassian.net/browse/ACS-8812",
"C280417": "https://hyland.atlassian.net/browse/ACS-8812",
"C217177": "https://hyland.atlassian.net/browse/ACS-8812",
"C280438": "https://hyland.atlassian.net/browse/ACS-8812",
"C290104": "https://hyland.atlassian.net/browse/ACS-8812",
"C217182": "https://hyland.atlassian.net/browse/ACS-8812",
"C217178": "https://hyland.atlassian.net/browse/ACS-8812",
"C217179": "https://hyland.atlassian.net/browse/ACS-8812",
"C217183": "https://hyland.atlassian.net/browse/ACS-8812",
"C280502": "https://hyland.atlassian.net/browse/ACS-8812",
"C217130": "https://hyland.atlassian.net/browse/ACS-8812",
"C217184": "https://hyland.atlassian.net/browse/ACS-8812"
}
4 changes: 3 additions & 1 deletion e2e/playwright/edit-actions/exclude.tests.json
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"XAT-5095": "https://hyland.atlassian.net/browse/ACS-8812"
}
4 changes: 3 additions & 1 deletion e2e/playwright/navigation/exclude.tests.json
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"C280034": "https://hyland.atlassian.net/browse/ACS-8812"
}
3 changes: 2 additions & 1 deletion e2e/playwright/search/exclude.tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"C290019": "https://hyland.atlassian.net/browse/ACS-6928",
"C290018": "https://hyland.atlassian.net/browse/ACS-6928",
"C699046-3": "https://hyland.atlassian.net/browse/ACS-7464",
"C699498": "https://hyland.atlassian.net/browse/ACS-7682"
"C699498": "https://hyland.atlassian.net/browse/ACS-7682",
"C280034": "https://hyland.atlassian.net/browse/ACS-8812"
}
4 changes: 3 additions & 1 deletion e2e/playwright/upload-download-actions/exclude.tests.json
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"C297548": "https://hyland.atlassian.net/browse/ACS-8812"
}
60 changes: 30 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "7.0.0-alpha.2-10939392007",
"@alfresco/adf-core": "7.0.0-alpha.2-10939392007",
"@alfresco/adf-extensions": "7.0.0-alpha.2-10939392007",
"@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.2-10939392007",
"@alfresco/js-api": "8.0.0-alpha.2-10939392007",
"@alfresco/adf-content-services": "7.0.0-alpha.2-10959284638",
"@alfresco/adf-core": "7.0.0-alpha.2-10959284638",
"@alfresco/adf-extensions": "7.0.0-alpha.2-10959284638",
"@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.2-10959284638",
"@alfresco/js-api": "8.0.0-alpha.2-10959284638",
"@angular/animations": "15.2.10",
"@angular/cdk": "15.2.9",
"@angular/common": "15.2.10",
Expand Down Expand Up @@ -62,7 +62,7 @@
"zone.js": "0.11.8"
},
"devDependencies": {
"@alfresco/adf-cli": "7.0.0-alpha.2-10939392007",
"@alfresco/adf-cli": "7.0.0-alpha.2-10959284638",
"@angular-devkit/build-angular": "15.2.10",
"@angular-devkit/core": "15.2.10",
"@angular-devkit/schematics": "15.2.10",
Expand Down
29 changes: 29 additions & 0 deletions projects/aca-content/assets/app.extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,16 @@
}
}
],
"icons": [
{
"id": "adf:three_magic_stars_ai",
"value": "./assets/images/three-magic-stars-ai.svg"
},
{
"id": "adf:colored-stars-ai",
"value": "./assets/images/colored-stars-ai.svg"
}
],
"create": [
{
"id": "app.create.folder",
Expand Down Expand Up @@ -194,6 +204,9 @@
"order": 100,
"title": "APP.BROWSE.FILE.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.FILE.SIDENAV_LINK.TOOLTIP",
"data": {
"canBeInactive": true
},
"children": [
{
"id": "app.navbar.personalFiles",
Expand Down Expand Up @@ -676,6 +689,22 @@
}
}
]
},
{
"id": "app.toolbar.ai.search",
"order": 0,
"title": "KNOWLEDGE_RETRIEVAL.SEARCH.AGENTS_BUTTON.TITLE",
"component": "app.toolbar.ai.agents-button",
"type": "custom",
"rules": {
"visible": "app.selection.displayedKnowledgeRetrievalButton"
},
"actions": {
"click": "app.action.toggle-ai-search-input.execute"
},
"data": {
"trigger": "TOGGLE_AI_SEARCH_INPUT"
}
}
],
"contextMenu": [
Expand Down
36 changes: 36 additions & 0 deletions projects/aca-content/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -609,5 +609,41 @@
"BOOKS-24PX": "file library",
"BASELINE-LOCK-24PX": "locked file"
}
},
"KNOWLEDGE_RETRIEVAL": {
"SEARCH": {
"RESULTS_PAGE": {
"QUERY_INPUT_PLACEHOLDER": "Would you like to ask anything else?",
"REFERENCED_DOCUMENTS_HEADER": "Referenced documents",
"REGENERATION_BUTTON_LABEL": "Regenerate",
"COPY_BUTTON_LABEL": "Copy",
"LIKE_BUTTON_LABEL": "Like",
"DISLIKE_BUTTON_LABEL": "Dislike",
"COPY_MESSAGE": "Copied response to clipboard"
},
"AGENTS_BUTTON": {
"LABEL": "Ask Discovery",
"TITLE": "Knowledge Retrieval"
},
"SEARCH_INPUT": {
"ASK_BUTTON_LABEL": "Ask",
"DEFAULT_PLACEHOLDER": "Please ask your question with as much detail as possible...",
"HIDE_INPUT": "Hide input"
},
"ERRORS": {
"AGENTS_FETCHING": "Error while fetching agents.",
"HX_INSIGHT_URL_FETCHING": "Error while fetching HX Insight URL.",
"LOADING_ERROR": "Hmm... something seems to have gone wrong.",
"PAGE_NOT_AVAILABLE_ERROR": "Page is not available for these conditions."
},
"DISCARD_CHANGES": {
"WARNING": "Warning!",
"ASK_AI": "Ask AI",
"DO_NOT_SHOW_MESSAGE": "Don't show this message again",
"OKAY": "Okay",
"CONVERSATION_DISCARDED": "This conversation will be discarded",
"LOSE_RESPONSE": "By asking another question you will lose your previous response"
}
}
}
}
19 changes: 19 additions & 0 deletions projects/aca-content/assets/images/colored-stars-ai.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions projects/aca-content/assets/images/three-magic-stars-ai.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions projects/aca-content/src/lib/aca-content.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import { ContextMenuComponent } from './components/context-menu/context-menu.com
import { MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
import { SearchResultsRowComponent } from './components/search/search-results-row/search-results-row.component';
import { BulkActionsDropdownComponent } from './components/bulk-actions-dropdown/bulk-actions-dropdown.component';
import { AgentsButtonComponent } from './components/knowledge-retrieval/search-ai/agents-button/agents-button.component';

@NgModule({
imports: [
Expand Down Expand Up @@ -138,6 +139,7 @@ export class ContentServiceExtensionModule {
'app.toolbar.toggleFavorite': ToggleFavoriteComponent,
'app.toolbar.toggleFavoriteLibrary': ToggleFavoriteLibraryComponent,
'app.toolbar.toggleJoinLibrary': ToggleJoinLibraryButtonComponent,
'app.toolbar.ai.agents-button': AgentsButtonComponent,
'app.menu.toggleJoinLibrary': ToggleJoinLibraryMenuComponent,
'app.bulk-actions-dropdown': BulkActionsDropdownComponent,
'app.shared-link.toggleSharedLink': ToggleSharedComponent,
Expand Down Expand Up @@ -197,6 +199,7 @@ export class ContentServiceExtensionModule {
'app.selection.hasNoLibraryRole': rules.hasNoLibraryRole,
'app.selection.folder': rules.hasFolderSelected,
'app.selection.folder.canUpdate': rules.canUpdateSelectedFolder,
'app.selection.displayedKnowledgeRetrievalButton': rules.canDisplayKnowledgeRetrievalButton,

'app.navigation.folder.canCreate': rules.canCreateFolder,
'app.navigation.folder.canUpload': rules.canUpload,
Expand Down
Loading

0 comments on commit 3ecaae8

Please sign in to comment.