inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-09-17 14:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIGRATION] - Something happened on the way to heaven

Browse Source
This commit is contained in:
VitoAlbano
2024-08-23 00:00:52 +01:00
parent 7836f8c706
commit ae27801430
21 changed files with 102 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@@ -9,3 +9,4 @@ scripts
/angular.json
docs/**/*.md
lib/js-api/docs/**/*.md
.storybook

8
.github/workflows/release-branch.yml vendored
View File

@@ -127,15 +127,15 @@ jobs:
run: |
set -u;
./scripts/update-version.sh -gnu || exit 1;
npx nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" --skip-nx-cache
npx nx affected $NX_CALCULATION_FLAGS --target=pretheme
npx nx affected:build --base=origin/develop --head=HEAD --prod --exclude="demoshell" --skip-nx-cache
npx nx affected --base=origin/develop --head=HEAD --target=pretheme
- 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 affected --target=npm-publish --base=origin/develop --head=HEAD --tag=branch|| exit 1
env:
NODE_AUTH_TOKEN: ${{ secrets.PAT_WRITE_PKG }}
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
@@ -144,7 +144,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 affected --target=npm-publish --base=origin/develop --head=HEAD --tag=branch || exit 1
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }}

4
demo-shell/src/app/components/cloud/task-details-cloud-demo.component.ts
View File

@@ -75,7 +75,9 @@ export class TaskDetailsCloudDemoComponent {
try {
errorMessage = JSON.parse(error).message || JSON.parse(error).entry?.message;
errorMessage = JSON.parse(errorMessage).message;
} catch {}
} catch {
/* empty */
}
this.notificationService.showError(errorMessage || error);
}
}

1
lib/content-services/src/lib/auth-loader/content-auth-loader-factory.ts
View File

@@ -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
*

4
lib/content-services/src/lib/common/services/rendition.service.ts
View File

@@ -114,7 +114,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));

4
lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
View File

@@ -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}`;

4
lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
View File

@@ -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';

4
lib/content-services/src/lib/document-list/components/document-list.component.ts
View File

@@ -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);

45
lib/content-services/src/lib/tree-view/data/tree-view-datasource.ts
View File

@@ -25,7 +25,6 @@ import { TreeViewService } from '../services/tree-view.service';
@Injectable()
export class TreeViewDataSource {
treeNodes: TreeBaseNode[];
dataChange = new BehaviorSubject<TreeBaseNode[]>([]);
childrenSubscription = null;
@@ -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>);
@@ -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);
}
}

1
lib/content-services/src/lib/version-compatibility/version-compatibility-factory.ts
View File

@@ -17,7 +17,6 @@
import { VersionCompatibilityService } from './version-compatibility.service';
// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
/**
* Create a version compatibility factory
*

8
lib/core/src/lib/clipboard/clipboard.service.ts
View File

@@ -53,7 +53,9 @@ export class ClipboardService {
this.document.execCommand('copy');
}
this.notify(message);
} catch {}
} catch {
/* empty */
}
}
}
@@ -76,7 +78,9 @@ export class ClipboardService {
document.execCommand('copy');
}
this.notify(message);
} catch {}
} catch {
/* empty */
}
}
private notify(message) {

1
lib/core/src/lib/common/services/directionality-config-factory.ts
View File

@@ -17,7 +17,6 @@
import { DirectionalityConfigService } from './directionality-config.service';
// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
/**
* Creates a factory for Angular modules
*

40
lib/core/src/lib/common/utils/file-utils.ts
View File

@@ -22,36 +22,38 @@ export interface FileInfo {
}
export class FileUtils {
static flatten(folder: any): Promise<FileInfo[]> {
const reader = folder.createReader();
const files: FileInfo[] = [];
return new Promise((resolve) => {
const iterations = [];
// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
(function traverse() {
reader.readEntries((entries) => {
if (!entries.length) {
Promise.all(iterations).then(() => resolve(files));
} else {
iterations.push(Promise.all(entries.map((entry) => {
if (entry.isFile) {
return new Promise<void>((resolveFile) => {
entry.file((file: File) => {
files.push({
entry,
file,
relativeFolder: entry.fullPath.replace(/\/[^/]*$/, '')
iterations.push(
Promise.all(
entries.map((entry) => {
if (entry.isFile) {
return new Promise<void>((resolveFile) => {
entry.file((file: File) => {
files.push({
entry,
file,
relativeFolder: entry.fullPath.replace(/\/[^/]*$/, '')
});
resolveFile();
});
});
resolveFile();
});
});
} else {
return FileUtils.flatten(entry).then((result) => {
files.push(...result);
});
}
})));
} else {
return FileUtils.flatten(entry).then((result) => {
files.push(...result);
});
}
})
)
);
// Try calling traverse() again for the same dir, according to spec
traverse();
}

25
lib/extensions/src/lib/services/extension.service.ts
View File

@@ -27,7 +27,6 @@ import { RuleService } from './rule.service';
import { ExtensionElement } from '../config/extension-element';
import { BehaviorSubject, Observable } from 'rxjs';
// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
/**
* The default extensions factory
*
@@ -35,7 +34,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
*/
export function extensionJsonsFactory() {
return [];
};
}
export const EXTENSION_JSONS = new InjectionToken<string[][]>('extension-jsons', {
providedIn: 'root',
@@ -47,7 +46,6 @@ export const EXTENSION_JSON_VALUES = new InjectionToken<string[][]>('extension-j
factory: extensionJsonsFactory
});
// eslint-disable-next-line prefer-arrow/prefer-arrow-functions
/**
* Provides the extension json values for the angular modules
*
@@ -60,7 +58,7 @@ export function provideExtensionConfig(jsons: string[]) {
useValue: jsons,
multi: true
};
};
}
/**
* Provides the extension json raw values for the angular modules
@@ -74,7 +72,7 @@ export function provideExtensionConfigValues(extensionConfigValue: ExtensionConf
useValue: extensionConfigValue,
multi: true
};
};
}
@Injectable({
providedIn: 'root'
@@ -109,12 +107,7 @@ export class ExtensionService {
* @returns The loaded config data
*/
async load(): Promise<ExtensionConfig> {
const config = await this.loader.load(
this.configPath,
this.pluginsPath,
this.extensionJsons.flat(),
this.extensionJsonValues.flat()
);
const config = await this.loader.load(this.configPath, this.pluginsPath, this.extensionJsons.flat(), this.extensionJsonValues.flat());
this.setup(config);
return config;
@@ -209,9 +202,7 @@ export class ExtensionService {
* @returns Array of auth guards or empty array if none were found
*/
getAuthGuards(ids: string[]): Array<Type<any>> {
return (ids || [])
.map((id) => this.authGuards[id])
.filter((guard) => guard);
return (ids || []).map((id) => this.authGuards[id]).filter((guard) => guard);
}
/**
@@ -272,12 +263,12 @@ export class ExtensionService {
* @param context Parameter object for the expression with details of app state
* @returns Result of evaluated expression, if found, or the literal value otherwise
*/
runExpression(value: string | any , context?: any) {
if (typeof value === 'string' ) {
runExpression(value: string | any, context?: any) {
if (typeof value === 'string') {
return this.evaluateExpression(value, context);
} else {
const duplicate = Object.assign({}, value);
Object.keys(duplicate).forEach( (key) => {
Object.keys(duplicate).forEach((key) => {
duplicate[key] = this.evaluateExpression(duplicate[key], context);
});
return duplicate;

6
lib/process-services-cloud/.storybook/main.js
View File

@@ -4,11 +4,7 @@ module.exports = {
rootMain: rootPath,
stories: [...rootPath.stories, '../**/*.stories.@(js|jsx|ts|tsx)'],
staticDirs: [
...rootPath.staticDirs,
{ from: __dirname + '/../src/lib/i18n', to: 'assets/adf-core/i18n' },
{ from: __dirname + '/../src/lib/assets/images', to: 'assets/images' }
],
staticDirs: [...rootPath.staticDirs, { from: __dirname + '/../src/lib/i18n', to: 'assets/adf-core/i18n' }],
addons: ['@storybook/addon-essentials', ...rootPath.addons],

8
lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts
View File

@@ -66,7 +66,9 @@ export class ContentCloudNodeSelectorService {
if (destinationFolderPath.alias && destinationFolderPath.path) {
try {
return await this.getNodeId(destinationFolderPath.alias, destinationFolderPath.path).toPromise();
} catch {}
} catch {
/*empty*/
}
}
return this.getNodeId(destinationFolderPath.alias).toPromise();
@@ -82,7 +84,9 @@ export class ContentCloudNodeSelectorService {
if (nodeId) {
try {
isExistingNode = await this.getNodeId(nodeId).pipe(mapTo(true)).toPromise();
} catch {}
} catch {
/*empty*/
}
}
return isExistingNode;
}

8
lib/testing/src/lib/protractor/core/actions/identity/group-identity.service.ts
View File

@@ -22,7 +22,6 @@ import { Logger } from '../../utils/logger';
import { browser } from 'protractor';
export class GroupIdentityService {
api: ApiService;
constructor(api: ApiService) {
@@ -75,9 +74,11 @@ export class GroupIdentityService {
Logger.log(`Data ${JSON.stringify(data)}`);
return data[0]; Logger.error('Group not found');
return data[0];
Logger.error('Group not found');
} catch (error) {
Logger.error('Group not found');
return null;
}
};
@@ -135,5 +136,4 @@ export class GroupIdentityService {
const data = await this.api.performIdentityOperation(path, method, queryParams, postBody);
return data[0].id;
}
}

8
lib/testing/src/lib/protractor/core/pages/data-table-component.page.ts
View File

@@ -388,7 +388,9 @@ export class DataTableComponentPage {
this.rootElement.element(by.tagName(materialLocators.Progress.spinner.root)),
MAX_LOADING_TIME
);
} catch (error) {}
} catch (error) {
Logger.error('Loading spinner is not present');
}
if (await this.isEmpty()) {
Logger.log('empty page');
@@ -414,7 +416,9 @@ export class DataTableComponentPage {
try {
Logger.log('wait datatable loading spinner is present');
await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName(materialLocators.Progress.bar.root)));
} catch (error) {}
} catch (error) {
Logger.error('Infinite pagination spinner is not present');
}
if (await this.isEmpty()) {
Logger.log('empty page');
} else {

3
lib/testing/src/lib/protractor/core/pages/login.page.ts
View File

@@ -43,6 +43,7 @@ export class LoginPage {
try {
currentUrl = await browser.getCurrentUrl();
} catch (e) {
/* do nothing */
}
if (!currentUrl || currentUrl.indexOf(this.loginUrl) === -1) {
@@ -87,7 +88,7 @@ export class LoginPage {
if (oauth2 && oauth2.silentLogin === false) {
Logger.log(`Login SSO`);
await this.clickOnSSOButton();
}else{
} else {
Logger.log(`Login SSO silent login`);
}

4
lib/testing/src/lib/protractor/core/pages/settings.page.ts
View File

@@ -42,7 +42,9 @@ export class SettingsPage {
try {
currentUrl = await browser.getCurrentUrl();
} catch (e) {}
} catch (e) {
/* do nothing */
}
if (!currentUrl || currentUrl.indexOf(this.settingsURL) === -1) {
await browser.get(this.settingsURL);

4
lib/testing/src/lib/protractor/core/pages/viewer.page.ts
View File

@@ -75,7 +75,9 @@ export class ViewerPage {
Logger.log('wait spinner is present');
await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName(materialLocators.Progress.spinner.root)));
await BrowserVisibility.waitUntilElementIsNotVisible(element(by.tagName(materialLocators.Progress.spinner.root)), MAX_LOADING_TIME);
} catch (error) {}
} catch (error) {
Logger.error('Spinner is not present');
}
}
}