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-8749] View More tags button no longer shows when all tags are removed from a node #10221

Open
wants to merge 28 commits into
base: ng16-migration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7f814dc
NG-16 - migration step 1
VitoAlbano Aug 1, 2024
6bdff2e
NG16 - fixed the builds
VitoAlbano Aug 5, 2024
f5c9ee6
[MIGRATION] - Switching off no empty functions rule
VitoAlbano Aug 22, 2024
a86bb19
[MIGRATION] - Somehow the fix for the cli types got lost
VitoAlbano Aug 22, 2024
34c1986
[MIGRATION] - Something happened on the way to heaven
VitoAlbano Aug 22, 2024
8325284
[MIGRATION] - Ok this is weird
VitoAlbano Aug 22, 2024
c67111d
[MIGRATION] - Ok this is really weird
VitoAlbano Aug 23, 2024
b24ec4b
[MIGRATION] - change selector for expanded expansion panel content
wojd0 Aug 12, 2024
b9301a2
[MIGRATION] - storybook chips related e2e fails fix, unit alignments
wojd0 Aug 12, 2024
effc0af
[MIGRATION] - Ok this is really weird
VitoAlbano Aug 23, 2024
5b86223
[MIGRATION] - Updating outdated packages
VitoAlbano Aug 23, 2024
72db69f
[MIGRATION] - updated deps for process cloud
VitoAlbano Aug 24, 2024
3083d3e
[MIGRATION] - Rebased to latest
VitoAlbano Sep 6, 2024
e8c611c
[MIGRATION] - Fixed lint
VitoAlbano Sep 6, 2024
7e144d1
[MIGRATION] - Fixed package version
VitoAlbano Sep 6, 2024
0c87668
Rebased with lastest changes
VitoAlbano Sep 9, 2024
e3f885f
[MIGRATION] - check to update the script
VitoAlbano Sep 9, 2024
f666b9a
[MIGRATION] - rebased after the move of AlfrescoApiService
VitoAlbano Sep 9, 2024
c6bc243
[MIGRATION] - fixed schematics build
VitoAlbano Sep 9, 2024
8ba2482
[MIGRATION] - the lesson is : do not change what is already working
VitoAlbano Sep 9, 2024
af7bb93
Updated dependency for apollo
VitoAlbano Sep 10, 2024
29e9cd8
Rebased to latestp
VitoAlbano Sep 10, 2024
6967134
Fixes after CR (#10202)
dominikiwanekhyland Sep 12, 2024
ff554da
Fixed white background issue in sidenav after ng16 upgrade (#10207)
dominikiwanekhyland Sep 12, 2024
dace3aa
[MIGRATION] fix header background color not being read from input prop
wojd0 Sep 16, 2024
66e30ee
Fixed build
VitoAlbano Sep 16, 2024
17f0966
NG-16 - migration step 1
VitoAlbano Aug 1, 2024
d3157f9
[ACS-8749] View More tags button no longer shows when all tags are re…
swapnil-verma-gl Sep 12, 2024
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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ scripts
/angular.json
docs/**/*.md
lib/js-api/docs/**/*.md
.storybook
10 changes: 5 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
'**/docs'
],

plugins: ['@nrwl/nx'],
plugins: ['@nx'],

overrides: [
{
Expand All @@ -22,11 +22,10 @@ module.exports = {
createDefaultProgram: true
},
extends: [
'plugin:@nrwl/nx/typescript',
'plugin:@nrwl/nx/angular',
'plugin:@nx/typescript',
'plugin:@nx/angular',
'plugin:@cspell/recommended',
'plugin:@angular-eslint/ng-cli-compat',
'plugin:@angular-eslint/ng-cli-compat--formatting-add-on',
'plugin:@angular-eslint/recommended',
'plugin:@angular-eslint/template/process-inline-templates',
'plugin:jsdoc/recommended-typescript-error'
],
Expand Down Expand Up @@ -104,6 +103,7 @@ module.exports = {
}
],
'@typescript-eslint/member-ordering': 'off',
'@typescript-eslint/no-empty-function': 'off',
'prefer-arrow/prefer-arrow-functions': 'off',
'prefer-promise-reject-errors': 'error',
'brace-style': 'off',
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ jobs:
npx nx run js-api:bundle
npx nx run cli:bundle
npx nx run testing:bundle
- run: npx nx print-affected $NX_CALCULATION_FLAGS
- uses: ./.github/actions/upload-node-modules-and-artifacts

unit-tests:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,16 @@ jobs:
setMigrations();
- name: Build libraries
run: |
npx nx affected:build $NX_CALCULATION_FLAGS --prod --skip-nx-cache
npx nx affected $NX_CALCULATION_FLAGS --target=pretheme
npx nx affected $NX_CALCULATION_FLAGS --target=build-schematics
npx nx run-many --target=build --prod --exclude="demoshell" --skip-nx-cache
npx nx run-many --target=pretheme
npx nx run-many --target=build-schematics
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
name: release libraries GH registry
with:
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@alfresco'
- run: npx nx affected --target=npm-publish $NX_CALCULATION_FLAGS --tag=branch|| exit 1
- run: npx nx run-many --target=npm-publish --tag=branch|| exit 1
env:
NODE_AUTH_TOKEN: ${{ secrets.PAT_WRITE_PKG }}
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
Expand All @@ -116,7 +116,7 @@ jobs:
node-version-file: '.nvmrc'
registry-url: 'https://${{ vars.NPM_REGISTRY_ADDRESS }}'
scope: '@alfresco'
- run: npx nx affected --target=npm-publish $NX_CALCULATION_FLAGS --tag=branch || exit 1
- run: npx nx run-many --target=npm-publish --tag=branch || exit 1
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ module.exports = {
staticDirs: [],
docs: {},
stories: [],
addons: []
addons: ['@chromatic-com/storybook']
};
2 changes: 1 addition & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export const parameters = {
docs: { inlineStories: true },
controls: { expanded: true }
};
export const tags = ['autodocs'];
export const tags = ['autodocs', 'autodocs', 'autodocs'];
323 changes: 161 additions & 162 deletions docs/release-notes/RelNote410.md

Large diffs are not rendered by default.

262 changes: 131 additions & 131 deletions docs/release-notes/RelNote420.md

Large diffs are not rendered by default.

374 changes: 187 additions & 187 deletions docs/release-notes/RelNote430.md

Large diffs are not rendered by default.

Binary file modified e2e/resources/adf/allFileTypes/documents/text/a_vsd_file.vsd
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions lib/cli/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": ["plugin:@nrwl/nx/angular"],
"extends": ["plugin:@nx/angular"],
"parserOptions": {
"project": ["lib/cli/tsconfig.json"],
"createDefaultProgram": true
Expand Down Expand Up @@ -44,7 +44,7 @@
"project": ["lib/cli/tsconfig.json"],
"createDefaultProgram": true
},
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"target": "es2018",
"lib": ["es2018", "dom"],
"baseUrl": ".",
"typeRoots": ["node_modules/@types"],
"typeRoots": ["node_modules/@types", "../../node_modules/@types"],
"types": ["node"],
"paths": {
"@alfresco/js-api": ["../../dist/libs/js-api"],
Expand Down
12 changes: 8 additions & 4 deletions lib/content-services/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": ["plugin:@nrwl/nx/angular"],
"extends": ["plugin:@nx/angular"],
"parserOptions": {
"project": ["lib/content-services/tsconfig.lib.json", "lib/content-services/tsconfig.spec.json"],
"createDefaultProgram": true
Expand All @@ -15,15 +15,19 @@
"@typescript-eslint/consistent-type-assertions": "warn",
"@typescript-eslint/prefer-for-of": "warn",
"@typescript-eslint/member-ordering": "off",
"no-underscore-dangle": ["error", { "allowAfterThis": true }],
"no-underscore-dangle": [
"error",
{
"allowAfterThis": true
}
],
"no-shadow": "warn",
"quote-props": "warn",
"object-shorthand": "warn",
"prefer-const": "warn",
"arrow-body-style": "warn",
"@angular-eslint/no-output-native": "off",
"space-before-function-paren": "warn",

"@angular-eslint/component-selector": [
"error",
{
Expand Down Expand Up @@ -80,7 +84,7 @@
"project": ["lib/content-services/tsconfig.lib.json", "lib/content-services/tsconfig.spec.json"],
"createDefaultProgram": true
},
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {
"@angular-eslint/template/no-autofocus": "error",
"@angular-eslint/template/no-positive-tabindex": "error"
Expand Down
8 changes: 1 addition & 7 deletions lib/content-services/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,5 @@ module.exports = {
options: {}
},

docs: {
autodocs: true
},

core: {
builder: '@storybook/builder-webpack5'
}
docs: {}
};
5 changes: 3 additions & 2 deletions lib/content-services/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const parameters = {
docs: { inlineStories: true },
controls: { expanded: true }
docs: { inlineStories: true },
controls: { expanded: true }
};
export const tags = ['autodocs', 'autodocs'];
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import { ContentAuthLoaderService } from './content-auth-loader.service';

// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
/**
* Create a content auth factory
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ export class RenditionService {
try {
await this.renditionsApi.createRendition(nodeId, { id: renditionId });
rendition = await this.waitRendition(nodeId, renditionId, 0);
} catch {}
} catch {
return null;
}
}
}
return new Promise<RenditionEntry>((resolve) => resolve(rendition));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {

try {
statusCode = JSON.parse(error.message).error.statusCode;
} catch {}
} catch {
/* empty */
}

let message = `METADATA.ERRORS.${statusCode}`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ export class ShareDialogComponent implements OnInit, OnDestroy {

try {
statusCode = JSON.parse(error.message).error.statusCode;
} catch {}
} catch {
/* empty */
}

if (statusCode === 403) {
message = 'SHARE.UNSHARE_PERMISSION_ERROR';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,9 @@ export class DocumentListComponent extends DataTableSchema implements OnInit, On
if (JSON.parse(err.message).error.statusCode === 403) {
this.noPermission = true;
}
} catch (error) {}
} catch (error) {
/* empty */
}
}
this.setLoadingState(false);
this.error.emit(err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { TreeViewService } from '../services/tree-view.service';

@Injectable()
export class TreeViewDataSource {

treeNodes: TreeBaseNode[];
dataChange = new BehaviorSubject<TreeBaseNode[]>([]);
childrenSubscription = null;
Expand All @@ -40,15 +39,13 @@ export class TreeViewDataSource {
this.dataChange.next(value);
}

constructor(private treeControl: FlatTreeControl<TreeBaseNode>,
private treeViewService: TreeViewService) {
this.dataChange.subscribe((treeNodes) => this.treeNodes = treeNodes);
constructor(private treeControl: FlatTreeControl<TreeBaseNode>, private treeViewService: TreeViewService) {
this.dataChange.subscribe((treeNodes) => (this.treeNodes = treeNodes));
}

connect(collectionViewer: CollectionViewer): Observable<TreeBaseNode[]> {
this.changeSubscription = this.treeControl.expansionModel.changed.subscribe((change) => {
if ((change as SelectionChange<TreeBaseNode>).added &&
(change as SelectionChange<TreeBaseNode>).added.length > 0) {
if ((change as SelectionChange<TreeBaseNode>).added && (change as SelectionChange<TreeBaseNode>).added.length > 0) {
this.expandTreeNodes(change as SelectionChange<TreeBaseNode>);
} else if ((change as SelectionChange<TreeBaseNode>).removed) {
this.reduceTreeNodes(change as SelectionChange<TreeBaseNode>);
Expand All @@ -71,33 +68,35 @@ export class TreeViewDataSource {
}

private reduceTreeNodes(change: SelectionChange<TreeBaseNode>) {
change.removed.slice().reverse().forEach((node) => this.toggleNode(node));
change.removed
.slice()
.reverse()
.forEach((node) => this.toggleNode(node));
}

private expandNode(node: TreeBaseNode) {
this.childrenSubscription = this.treeViewService.getTreeNodes(node.nodeId)
.subscribe((children) => {
const index = this.data.indexOf(node);
if (!children || index < 0) {
node.expandable = false;
return;
}
const nodes = children.map((actualNode) => {
actualNode.level = node.level + 1;
return actualNode;
});
this.data.splice(index + 1, 0, ...nodes);
this.dataChange.next(this.data);
this.childrenSubscription = this.treeViewService.getTreeNodes(node.nodeId).subscribe((children) => {
const index = this.data.indexOf(node);
if (!children || index < 0) {
node.expandable = false;
return;
}
const nodes = children.map((actualNode) => {
actualNode.level = node.level + 1;
return actualNode;
});
this.data.splice(index + 1, 0, ...nodes);
this.dataChange.next(this.data);
});
}

toggleNode(node: TreeBaseNode) {
const index = this.data.indexOf(node);
let count = 0;
for (let i = index + 1; i < this.data.length
&& this.data[i].level > node.level; i++ , count++) { }
for (let i = index + 1; i < this.data.length && this.data[i].level > node.level; i++, count++) {
/* empty */
}
this.data.splice(index + 1, count);
this.dataChange.next(this.data);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import { VersionCompatibilityService } from './version-compatibility.service';

// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
/**
* Create a version compatibility factory
*
Expand Down
13 changes: 8 additions & 5 deletions lib/core/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"overrides": [
{
"files": ["*.ts"],
"extends": ["plugin:@nrwl/nx/angular"],
"extends": ["plugin:@nx/angular"],
"parserOptions": {
"project": ["lib/core/tsconfig.lib.json", "lib/core/tsconfig.spec.json"],
"createDefaultProgram": true
Expand All @@ -15,7 +15,12 @@
"@typescript-eslint/consistent-type-assertions": "warn",
"@typescript-eslint/prefer-for-of": "off",
"@typescript-eslint/member-ordering": "off",
"no-underscore-dangle": ["error", { "allowAfterThis": true }],
"no-underscore-dangle": [
"error",
{
"allowAfterThis": true
}
],
"no-shadow": "warn",
"quote-props": "warn",
"object-shorthand": "warn",
Expand All @@ -24,7 +29,6 @@
"arrow-body-style": "warn",
"@angular-eslint/no-output-native": "off",
"space-before-function-paren": "warn",

"@angular-eslint/component-selector": [
"error",
{
Expand Down Expand Up @@ -77,11 +81,10 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {
"@angular-eslint/template/no-autofocus": "error",
"@angular-eslint/template/no-positive-tabindex": "error",

"@angular-eslint/template/no-negated-async": "off"
}
}
Expand Down
7 changes: 6 additions & 1 deletion lib/core/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@ module.exports = {
...rootMain,
core: { ...rootMain.core, builder: 'webpack5' },
stories: [...rootMain.stories, '../**/*.stories.@(js|jsx|ts|tsx)'],

framework: {
name: "@storybook/angular",
options: (()=>console.log('loaded config!'))()
},

staticDirs: [
...rootMain.staticDirs,
{ from: __dirname + '/../src/lib/i18n', to: 'assets/adf-core/i18n' },
{ from: __dirname + '/../src/lib/assets/images', to: 'assets/images' }
],
addons: ['@storybook/addon-essentials', ...rootMain.addons]

addons: ['@storybook/addon-essentials', ...rootMain.addons],

docs: {}
};
1 change: 1 addition & 0 deletions lib/core/.storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ const rootPreview = require('../../../.storybook/preview');
export const parameters = {
...rootPreview.preview
};
export const tags = ['autodocs', 'autodocs'];
Loading