Skip to content
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.

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

[ACS-3742] Layout changes for workspace #2980

Merged
merged 85 commits into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
e2c1511
Layout changes for workspace sidemenu
Yasa-Nataliya Feb 7, 2023
0bfad39
added header and search layout changes
SheenaMalhotra182 Feb 8, 2023
f75e491
implemented review comments and removed process related code
SheenaMalhotra182 Feb 9, 2023
977e273
Added expand and collapse functionality
Yasa-Nataliya Feb 9, 2023
28940f6
Modified the paths
Yasa-Nataliya Feb 10, 2023
92dd5c2
linting fixes
SheenaMalhotra182 Feb 10, 2023
1b240d7
use standard material settings icon
DenysVuika Feb 10, 2023
1c91c8e
use only specific modules needed for page layout
DenysVuika Feb 10, 2023
037dbfc
use standard "menu" icon for now
DenysVuika Feb 10, 2023
2a9805b
use standard avatar icon for now
DenysVuika Feb 10, 2023
f1483ed
cleanup user profile menu item
DenysVuika Feb 10, 2023
aa0ef41
cleanup About component layout
DenysVuika Feb 10, 2023
c145076
remove hardcoded settings route
DenysVuika Feb 10, 2023
b48bead
deprecate "headerImagePath"
DenysVuika Feb 11, 2023
368b44e
deprecate "headerTextColor" customisation
DenysVuika Feb 11, 2023
d8e5259
deprecate "headerColor" customisation
DenysVuika Feb 11, 2023
4c1b8b8
proper toggle of the side menu
DenysVuika Feb 11, 2023
060c230
proper sidebar header implementation
DenysVuika Feb 11, 2023
a11dcd6
user profile basic cleanup
DenysVuika Feb 11, 2023
8b3571d
minor fixes
DenysVuika Feb 11, 2023
a43e75f
cleanup buttons
DenysVuika Feb 11, 2023
47fb4c8
remove old app layout and use ADF one
DenysVuika Feb 13, 2023
036c5af
remove old header component
DenysVuika Feb 13, 2023
33ee9af
cleanup old layout module
DenysVuika Feb 13, 2023
b742c07
fix unit tests
DenysVuika Feb 13, 2023
224a7c1
cleanup unit tests
DenysVuika Feb 13, 2023
e58e07a
cleanup header actions module
DenysVuika Feb 13, 2023
7b5909b
deprecate unused main-action component
DenysVuika Feb 13, 2023
c62a39a
cleanup styles
DenysVuika Feb 13, 2023
5795825
restore removed method
DenysVuika Feb 13, 2023
7013554
cleanup search results toolbar
DenysVuika Feb 13, 2023
e8e87c2
restore expand menu functionality
DenysVuika Feb 13, 2023
8df3f75
cleanup code, back buttons for about and profile
DenysVuika Feb 13, 2023
67a9c11
restore original code
DenysVuika Feb 13, 2023
b2866e3
proper collapse button
DenysVuika Feb 13, 2023
3a413db
remove unused i18n key
DenysVuika Feb 13, 2023
9232d1f
styles cleanup
DenysVuika Feb 13, 2023
f481d25
cleanup sidebar
DenysVuika Feb 13, 2023
cdfb674
cleanup user profile
DenysVuika Feb 14, 2023
bc06437
add safety checks for focus after close
DenysVuika Feb 14, 2023
8d65317
layout fixes
DenysVuika Feb 14, 2023
0058896
update view profile unit tests
DenysVuika Feb 14, 2023
db524cb
code cleanup after reviews
DenysVuika Feb 14, 2023
f7ef3a8
cleanup header actions
DenysVuika Feb 14, 2023
d8a370f
fix menu population, user info
DenysVuika Feb 25, 2023
a854a3b
improved upload and create actions
DenysVuika Feb 25, 2023
e8dbd51
remove useless tests
DenysVuika Feb 25, 2023
c40798d
fix folder rules tests
DenysVuika Feb 25, 2023
b213a4f
search button workaround
DenysVuika Feb 25, 2023
084414a
e2e: remove wait
DenysVuika Feb 25, 2023
a49ddd2
add create/upload tooltips
DenysVuika Feb 25, 2023
955dab6
e2e fix
DenysVuika Feb 28, 2023
883d654
e2e fix
DenysVuika Feb 28, 2023
d34351b
e2e fix
DenysVuika Feb 28, 2023
b6a9b80
e2e fix
DenysVuika Feb 28, 2023
98160e7
e2e fix
DenysVuika Feb 28, 2023
a01d94a
e2e fix
DenysVuika Feb 28, 2023
170bd83
e2e fix
DenysVuika Feb 28, 2023
0aa384c
e2e fix
DenysVuika Feb 28, 2023
874c091
e2e fix
DenysVuika Feb 28, 2023
38886ef
e2e fix
DenysVuika Mar 1, 2023
304d7e4
e2e fix
DenysVuika Mar 1, 2023
8ab7b98
e2e fix
DenysVuika Mar 1, 2023
c00360d
try fix e2e
DenysVuika Mar 1, 2023
dd7d567
update e2e extension configs
DenysVuika Mar 1, 2023
a7f62bf
try fix e2e
DenysVuika Mar 1, 2023
09ac9d5
try fix e2e
DenysVuika Mar 1, 2023
0ba79d7
fix eslint config
DenysVuika Mar 1, 2023
4257f8a
try fix e2e
DenysVuika Mar 1, 2023
9e4c890
move search button to extensions
DenysVuika Mar 1, 2023
87fb5d9
move upload and create to extensions
DenysVuika Mar 1, 2023
b5dac72
remove header actions as no longer needed
DenysVuika Mar 1, 2023
65aa548
cleanup
DenysVuika Mar 1, 2023
d6e2aa9
e2e fixes and cleanup for unwanted files
Mar 17, 2023
4e09661
linting fixes
Mar 17, 2023
5ad23f2
linting fixes
Mar 17, 2023
36f6748
added button type to support text buttons
Mar 31, 2023
13b5018
linting fixes
Mar 31, 2023
3718fc7
added more unit tests to achieve code coverage requirement
Apr 3, 2023
396305c
fixing code covergae for aca-content
Apr 3, 2023
45ccfdb
fixed code coverage for aca-shared
Yasa-Nataliya Apr 4, 2023
25cf1a1
linting fixes
Apr 19, 2023
bb118a9
linting fixes
Apr 19, 2023
f65a3a6
cleanup
Apr 19, 2023
b9997d6
version fix
Apr 20, 2023
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
7 changes: 2 additions & 5 deletions app/src/app.config.json.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@
},
"locale": "en",
"application": {
"name": "Alfresco Content Application",
"name": "Workspace",
"version": "4.0.0-A.3",
"logo": "assets/images/alfresco-logo-flower.svg",
"headerImagePath": "assets/images/mastHead-bg-shapesPattern.svg",
"logo": "assets/images/app-logo.svg",
"copyright": "APP.COPYRIGHT"
},
"viewer.maxRetries": 1,
"sharedLinkDateTimePickerType": "datetime",
"headerColor": "#ffffff",
"headerTextColor": "#000000",
"customCssPath": "",
"webFontPath": "",
"pagination": {
Expand Down
4 changes: 4 additions & 0 deletions app/src/assets/images/app-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 0 additions & 23 deletions docs/configuration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,29 +89,6 @@ The default logo displayed in the top left corner of the Alfresco Content Applic
}
```

### Header Background color

You can change the header text and background colors by specifying the color code for the "headerTextColor" and "headerColor" keys:

```json
{
"headerTextColor": "#000000",
"headerColor": "#ffffff"
}
```

### Header background image

You can change the header background image by specifying the path to the corresponding resource:

```json
{
"application": {
"headerImagePath": "assets/images/mastHead-bg-shapesPattern.svg"
}
}
```

### Restricted content

You can restrict users from uploading certain types of files and folders by setting or extending the list of rules at the "files.excluded" path.
Expand Down
22 changes: 0 additions & 22 deletions docs/ja/getting-started/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,28 +89,6 @@ Alfresco コンテンツアプリケーションの左上隅に表示される
}
```

### ヘッダーの背景色

"headerColor" キーの色コードを指定することにより、ヘッダーの背景色を変更できます:

```json
{
"headerColor": "#ffffff"
}
```

### ヘッダーの背景画像

ヘッダーの背景画像を変更するには、対応するリソースへのパスを指定します:

```json
{
"application": {
"headerImagePath": "assets/images/mastHead-bg-shapesPattern.svg"
}
}
```

### 制限されたコンテンツ

"files.excluded" パスにあるルールのリストを設定または拡張することで、ユーザーが特定の種類のファイルやフォルダをアップロードできないように制限することができます。
Expand Down
4 changes: 4 additions & 0 deletions e2e/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
],
"createDefaultProgram": true
},
"plugins": [
"rxjs",
"unicorn"
],
"rules": {
}
}
Expand Down
54 changes: 20 additions & 34 deletions e2e/resources/extensibility-configs/context-submenus-ext.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,43 +196,18 @@
"route": "personal-files"
},
{
"id": "app.navbar.libraries.menu",
"id": "app.navbar.libraries.files",
"order": 200,
"icon": "library_books",
"title": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.TOOLTIP",
"children": [
{
"id": "app.navbar.libraries.favorite",
"order": 100,
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.libraries.files",
"order": 200,
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
}
]
}
]
},
{
"id": "app.navbar.secondary",
"items": [
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
},
{
"id": "app.navbar.shared",
"id": "app.navbar.libraries.favorite",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.recentFiles",
Expand All @@ -242,6 +217,17 @@
"description": "APP.BROWSE.RECENT.SIDENAV_LINK.TOOLTIP",
"route": "recent-files"
},
{
"id": "app.navbar.shared",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
},
{
"id": "app.navbar.favorites",
"order": 300,
Expand Down
54 changes: 20 additions & 34 deletions e2e/resources/extensibility-configs/document-presets-ext.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,43 +196,18 @@
"route": "personal-files"
},
{
"id": "app.navbar.libraries.menu",
"id": "app.navbar.libraries.files",
"order": 200,
"icon": "library_books",
"title": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.TOOLTIP",
"children": [
{
"id": "app.navbar.libraries.favorite",
"order": 100,
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.libraries.files",
"order": 200,
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
}
]
}
]
},
{
"id": "app.navbar.secondary",
"items": [
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
},
{
"id": "app.navbar.shared",
"id": "app.navbar.libraries.favorite",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.recentFiles",
Expand All @@ -242,6 +217,17 @@
"description": "APP.BROWSE.RECENT.SIDENAV_LINK.TOOLTIP",
"route": "recent-files"
},
{
"id": "app.navbar.shared",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
},
{
"id": "app.navbar.favorites",
"order": 300,
Expand Down
54 changes: 20 additions & 34 deletions e2e/resources/extensibility-configs/header-ext.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,43 +223,18 @@
"route": "personal-files"
},
{
"id": "app.navbar.libraries.menu",
"id": "app.navbar.libraries.files",
"order": 200,
"icon": "library_books",
"title": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.TOOLTIP",
"children": [
{
"id": "app.navbar.libraries.favorite",
"order": 100,
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.libraries.files",
"order": 200,
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
}
]
}
]
},
{
"id": "app.navbar.secondary",
"items": [
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
},
{
"id": "app.navbar.shared",
"id": "app.navbar.libraries.favorite",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.recentFiles",
Expand All @@ -269,6 +244,17 @@
"description": "APP.BROWSE.RECENT.SIDENAV_LINK.TOOLTIP",
"route": "recent-files"
},
{
"id": "app.navbar.shared",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
},
{
"id": "app.navbar.favorites",
"order": 300,
Expand Down
54 changes: 20 additions & 34 deletions e2e/resources/extensibility-configs/info-drawer-ext.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,43 +196,18 @@
"route": "personal-files"
},
{
"id": "app.navbar.libraries.menu",
"id": "app.navbar.libraries.files",
"order": 200,
"icon": "library_books",
"title": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.TOOLTIP",
"children": [
{
"id": "app.navbar.libraries.favorite",
"order": 100,
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.libraries.files",
"order": 200,
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
}
]
}
]
},
{
"id": "app.navbar.secondary",
"items": [
"title": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "libraries"
},
{
"id": "app.navbar.shared",
"id": "app.navbar.libraries.favorite",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
"title": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.SIDENAV_LINK.TOOLTIP",
"route": "favorite/libraries"
},
{
"id": "app.navbar.recentFiles",
Expand All @@ -242,6 +217,17 @@
"description": "APP.BROWSE.RECENT.SIDENAV_LINK.TOOLTIP",
"route": "recent-files"
},
{
"id": "app.navbar.shared",
"order": 100,
"icon": "people",
"title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
"description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
"route": "shared",
"rules": {
"visible": "repository.isQuickShareEnabled"
}
},
{
"id": "app.navbar.favorites",
"order": 300,
Expand Down
Loading