inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest ADF alpha (#1079)

Browse Source 
* update to latest ADF alpha version

* better date column display - ellipsis fix

* renaming to prepare to clean-up document-list scss overrides

* fix ellipsis display & cells min-width

* update to a more latest ADF alpha
This commit is contained in:
Suzana Dirla
2019-04-17 22:15:39 +03:00
committed by Denys Vuika
parent 1519008de2
commit 434ab8a655
7 changed files with 57 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
package-lock.json generated
View File

@@ -5,33 +5,33 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "3.2.0-6ad63055b35b43eb305359b6f47851facd672476", "version": "3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.2.0-6ad63055b35b43eb305359b6f47851facd672476.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2.tgz",
"integrity": "sha512-em9lmfsdco7q6nQrvBsnnyxZhxYFgqsjnrPUJkF30U20HVbLn9C0PQpqch24qoJGF//qMzvnIR+DmkeUmYntbA==", "integrity": "sha512-nOQtKpX32HV8FFgxdgN/ifwCGdnI7o1/8CeMGEE5bubekjghYRknJYwQyp1nA+NsiJJncoctL+q9PRqQ/Z4G4A==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "3.2.0-dac3bed09f5e8235868555c24102f91dcae9c6e1", "version": "3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.2.0-dac3bed09f5e8235868555c24102f91dcae9c6e1.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2.tgz",
"integrity": "sha512-GwSkh42tUvTRjfnkZ8kJiuF8wB0C4137cm/JA11raT5mihrCzTBwH3GutmnWRZuxLXE4wwKRquTD5s0Bbh4K1w==", "integrity": "sha512-GRdiKRAH9PJUnmGWOvODms64NEXRMtkbcJ6W/6WujEupmL+/b+2cbDEBsUWHh88X4NScvGAA0R7A3opwiMFO/w==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "3.2.0-6ad63055b35b43eb305359b6f47851facd672476", "version": "3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.2.0-6ad63055b35b43eb305359b6f47851facd672476.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2.tgz",
"integrity": "sha512-YIFi8iZg8/2/e866a9KXb3sOlzbjd1MePp7L0bA2YLQE+gOw7Xka4e++ieZtLA6Oo7SWZt1l6wkdfscx+WS/cQ==", "integrity": "sha512-JH42ew6qcrPWjQfhFKR/PYZ2efQOOMxIscfLUhBu9nT5D8wCShG0wvkqrSD3tPm9+CkOxDOSDIbuLxpn1Bhusw==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/js-api": { "@alfresco/js-api": {
"version": "3.1.0-2c7e78d49c51ba0966d4e6c4dedf2b64da83d630", "version": "3.2.0-fa5916ff413131513c3e382d7f27dd9b4cfa0e7e",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.1.0-2c7e78d49c51ba0966d4e6c4dedf2b64da83d630.tgz", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.2.0-fa5916ff413131513c3e382d7f27dd9b4cfa0e7e.tgz",
"integrity": "sha512-7KNSCMq4/8Bluhm5DzdGRNg36H7ZE9Ei9s6JY1yWrYgGH/ObOCYnJKx4kyAetqFbktD+C/1LHCHyPsF+0qkZ2g==", "integrity": "sha512-3fhNh0+jqDzO6JavRhhYhGr2RZTLwSFIDF+uY2mcGCLWEiI0t81kyv4cYhO1hOHayfwXd6cn6hB7GZIChKrCZw==",
"requires": { "requires": {
"event-emitter": "0.3.4", "event-emitter": "0.3.4",
"superagent": "3.8.2" "superagent": "3.8.2"
@@ -536,7 +536,7 @@
}, },
"load-json-file": { "load-json-file": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
"dev": true, "dev": true,
"requires": { "requires": {
@@ -583,7 +583,7 @@
}, },
"pify": { "pify": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true "dev": true
}, },
@@ -4959,8 +4959,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@@ -4981,14 +4980,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@@ -5003,20 +5000,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@@ -5133,8 +5127,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@@ -5146,7 +5139,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@@ -5161,7 +5153,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@@ -5169,14 +5160,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@@ -5195,7 +5184,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@@ -5276,8 +5264,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@@ -5289,7 +5276,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@@ -5375,8 +5361,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@@ -5412,7 +5397,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@@ -5432,7 +5416,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@@ -5476,14 +5459,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },

8
package.json
View File

@@ -36,10 +36,10 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "3.2.0-6ad63055b35b43eb305359b6f47851facd672476", "@alfresco/adf-content-services": "3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2",
"@alfresco/adf-core": "3.2.0-dac3bed09f5e8235868555c24102f91dcae9c6e1", "@alfresco/adf-core": "3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2",
"@alfresco/adf-extensions": "3.2.0-6ad63055b35b43eb305359b6f47851facd672476", "@alfresco/adf-extensions": "3.2.0-bcdfcee39750ffcee85a78c6f099a5a8b6ece0c2",
"@alfresco/js-api": "3.1.0-2c7e78d49c51ba0966d4e6c4dedf2b64da83d630", "@alfresco/js-api": "3.2.0-fa5916ff413131513c3e382d7f27dd9b4cfa0e7e",
"@angular/animations": "7.2.13", "@angular/animations": "7.2.13",
"@angular/cdk": "^7.3.7", "@angular/cdk": "^7.3.7",
"@angular/common": "7.2.13", "@angular/common": "7.2.13",

4
src/app/components/common/location-link/location-link.component.ts
View File

@@ -54,7 +54,9 @@ import { TranslationService } from '@alfresco/adf-core';
`, `,
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None,
host: { class: 'aca-location-link adf-location-cell aca-column-content' } host: {
class: 'aca-location-link adf-location-cell adf-datatable-content-cell'
}
}) })
export class LocationLinkComponent implements OnInit { export class LocationLinkComponent implements OnInit {
private _path: PathInfo; private _path: PathInfo;

4
src/app/components/dl-custom-components/name-column/name-column.component.ts
View File

@@ -36,7 +36,9 @@ import { isLocked } from '../../../utils/node.utils';
templateUrl: './name-column.component.html', templateUrl: './name-column.component.html',
styleUrls: ['name-column.component.scss'], styleUrls: ['name-column.component.scss'],
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None,
host: { class: ' aca-column-content adf-datatable-link adf-name-column' } host: {
class: ' adf-datatable-content-cell adf-datatable-link adf-name-column'
}
}) })
export class CustomNameColumnComponent extends NameColumnComponent export class CustomNameColumnComponent extends NameColumnComponent
implements OnInit, OnDestroy { implements OnInit, OnDestroy {

2
src/app/ui/custom-theme.scss
View File

@@ -95,7 +95,7 @@ $foreground: map-get($custom-theme, foreground);
//Custom variables - ACA specific styling: //Custom variables - ACA specific styling:
$document-list-selection-color: mat-color($alfresco-ecm-blue, 500); $document-list-selection-color: mat-color($alfresco-ecm-blue, 500);
$document-list-background: white; $document-list-background: white;
$document-list-thumbnail-width: 35px; $data-table-thumbnail-width: 35px;
$adf-pagination--border: 1px solid mat-color($foreground, text, 0.07); $adf-pagination--border: 1px solid mat-color($foreground, text, 0.07);
$adf-pagination__empty--height: 0; $adf-pagination__empty--height: 0;

26
src/app/ui/overrides/adf-document-list.theme.scss
View File

@@ -10,19 +10,25 @@
$document-list-background: mat-color($background, background) !default; $document-list-background: mat-color($background, background) !default;
$document-list-text-color: mat-color($foreground, text, 0.54) !default; $document-list-text-color: mat-color($foreground, text, 0.54) !default;
$document-list-name-text-color: mat-color($foreground, text) !default; $document-list-name-text-color: mat-color($foreground, text) !default;
$document-list-thumbnail-width: 50px !default; $data-table-thumbnail-width: 50px !default;
.adf-datatable-list { .adf-datatable-list {
border: none; border: none;
.adf-datatable-cell-container { .adf-datatable-cell-container {
.aca-column-content, .adf-datatable-content-cell,
.adf-name-column, .adf-name-column,
.adf-library-name-column, .adf-library-name-column,
.adf-trashcan-name-column { .adf-trashcan-name-column,
.adf-name-location-cell {
position: absolute; position: absolute;
max-width: calc(100% - 0px); max-width: calc(100% - 0px);
.adf-datatable-cell-value {
text-overflow: ellipsis;
overflow: hidden;
}
// remove this style once the [ADF-4401] issue is fixed: // remove this style once the [ADF-4401] issue is fixed:
&.adf-datatable-cell { &.adf-datatable-cell {
.adf-datatable-cell-value { .adf-datatable-cell-value {
@@ -49,9 +55,9 @@
} }
.adf-datatable-cell--image { .adf-datatable-cell--image {
min-width: $document-list-thumbnail-width; min-width: $data-table-thumbnail-width;
width: $document-list-thumbnail-width; width: $data-table-thumbnail-width;
max-width: $document-list-thumbnail-width; max-width: $data-table-thumbnail-width;
} }
} }
@@ -72,14 +78,14 @@
.adf-datatable-cell { .adf-datatable-cell {
padding: 0 2px; padding: 0 2px;
box-sizing: border-box; box-sizing: border-box;
min-width: 100px;
&.adf-no-grow-cell {
min-width: 120px; min-width: 120px;
&.adf-datatable-cell--fileSize {
min-width: 80px;
} }
&:first-child { &:first-child {
min-width: $document-list-thumbnail-width; min-width: $data-table-thumbnail-width;
} }
&:focus { &:focus {

10
src/assets/app.extensions.json
View File

@@ -1090,7 +1090,7 @@
"title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON",
"type": "date", "type": "date",
"format": "timeAgo", "format": "timeAgo",
"class": "adf-ellipsis-cell adf-no-grow-cell", "class": "adf-ellipsis-cell",
"sortable": true, "sortable": true,
"desktopOnly": true "desktopOnly": true
}, },
@@ -1224,7 +1224,7 @@
"key": "modifiedAt", "key": "modifiedAt",
"title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON",
"type": "date", "type": "date",
"class": "adf-ellipsis-cell adf-no-grow-cell", "class": "adf-ellipsis-cell",
"format": "timeAgo", "format": "timeAgo",
"sortable": true, "sortable": true,
"desktopOnly": true "desktopOnly": true
@@ -1291,7 +1291,7 @@
"title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON",
"type": "date", "type": "date",
"format": "timeAgo", "format": "timeAgo",
"class": "adf-ellipsis-cell adf-no-grow-cell", "class": "adf-ellipsis-cell",
"sortable": true, "sortable": true,
"desktopOnly": true "desktopOnly": true
} }
@@ -1339,7 +1339,7 @@
"title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON", "title": "APP.DOCUMENT_LIST.COLUMNS.MODIFIED_ON",
"type": "date", "type": "date",
"format": "timeAgo", "format": "timeAgo",
"class": "adf-ellipsis-cell adf-no-grow-cell", "class": "adf-ellipsis-cell",
"sortable": true, "sortable": true,
"desktopOnly": true "desktopOnly": true
}, },
@@ -1396,7 +1396,7 @@
"title": "APP.DOCUMENT_LIST.COLUMNS.DELETED_ON", "title": "APP.DOCUMENT_LIST.COLUMNS.DELETED_ON",
"type": "date", "type": "date",
"format": "timeAgo", "format": "timeAgo",
"class": "adf-ellipsis-cell adf-no-grow-cell", "class": "adf-ellipsis-cell",
"sortable": true, "sortable": true,
"desktopOnly": true "desktopOnly": true
} }