Skip to content

Commit 269f911

Browse files
authored
Fix npm installation and cypress testing failures do to bump upgrade (#260)
* Fix npm installation and cypress testing failures do to bump upgrade * Update tagged_release.yml * Fix npm install problems * Fix action workflow * Update package-lock.json * Fix selection also on linux and windows
1 parent 5c810e6 commit 269f911

File tree

6 files changed

+5725
-7156
lines changed

6 files changed

+5725
-7156
lines changed

.github/workflows/push_request_check.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@ jobs:
4242
cache: 'npm'
4343
cache-dependency-path: '**/package-lock.json'
4444

45+
- name: Clear npm cache
46+
run: npm cache clean --force
47+
4548
- name: Install node modules (Dev)
46-
run: npm install --legacy-peer-deps # When @nx/angular plugin is updated, this flag can be removed
49+
run: |
50+
npm ci --include=optional
51+
npm rebuild nx --update-binary
4752
working-directory: core
4853

4954
- name: Identifying and reporting lint patterns

.github/workflows/tagged_release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,13 @@ jobs:
165165
}
166166
shell: pwsh
167167

168+
- name: Clear npm cache
169+
run: npm cache clean --force
170+
168171
- name: Install node modules
169-
run: npm install --legacy-peer-deps # When @nx/angular plugin is updated, this flag can be removed
172+
run: |
173+
npm ci --include=optional
174+
npm rebuild nx --update-binary
170175
working-directory: core
171176

172177
- name: Set app version (Unix)

core/apps/ame-e2e/src/support/helpers.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ export class cyHelp {
296296

297297
if (selectMultipleShapes) {
298298
if (Cypress.platform !== 'darwin') {
299-
cy.get('body').type('{ctrl}', {release: false});
299+
cy.get('body').type('{ctrl}', {release: false, force: true});
300300
} else {
301-
cy.get('body').type('{meta}', {release: false});
301+
cy.get('body').type('{meta}', {release: false, force: true});
302302
}
303303
}
304304

@@ -307,13 +307,13 @@ export class cyHelp {
307307
.getHTMLCell(name)
308308
.first()
309309
.click({force: true})
310-
.then(() => cy.get('body').type('{ctrl}'));
310+
.then(() => cy.get('body').type('{ctrl}', {force: true}));
311311
} else {
312312
return cy
313313
.getHTMLCell(name)
314314
.first()
315315
.click({force: true})
316-
.then(() => cy.get('body').type('{meta}'));
316+
.then(() => cy.get('body').type('{meta}', {force: true}));
317317
}
318318
}
319319

core/libs/editor/src/lib/editor-dialog/components/fields/characteristic/data-type-input-field/data-type-input-field.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ export class DataTypeInputFieldComponent extends InputFieldComponent<DefaultChar
6868

6969
getCurrentValue() {
7070
return !this.metaModelElement.isPredefined()
71-
? this.previousData?.['dataType'] ??
71+
? (this.previousData?.['dataType'] ??
7272
this.previousData?.['newDataType'] ??
7373
this.previousData?.[this.fieldName] ??
74-
this.metaModelElement?.dataType
74+
this.metaModelElement?.dataType)
7575
: this.metaModelElement?.dataType;
7676
}
7777

0 commit comments

Comments
 (0)