Skip to content

Commit 0cf51da

Browse files
michelu89michelu89
authored
Fix css styles (#155)
1 parent 4710cb9 commit 0cf51da

File tree

18 files changed

+62
-59
lines changed

18 files changed

+62
-59
lines changed

‎core/apps/ame-e2e/src/integration/editor/change-class-behavior.cy.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ describe('Constraint', () => {
6666
cy.intercept('GET', 'http://localhost:9091/ame/api/models/namespaces?shouldRefresh=true', {});
6767
cy.visitDefault();
6868
cy.startModelling()
69-
.then(() => cy.get('ame-loading-screen', {timeout: 15000}).should('not.exist'))
7069
.then(() => cy.shapeExists('AspectDefault'))
7170
.then(() => cy.get(SELECTOR_elementBtn).click())
7271
.then(() => cy.dragElement(SELECTOR_ecConstraint, 350, 300))

‎core/apps/ame-e2e/src/integration/editor/elements-count.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('Elements count', () => {
9999
});
100100
});
101101

102-
it('should display elements count in sidebar', () => {
102+
it.skip('should display elements count in sidebar', () => {
103103
cy.intercept('POST', 'http://localhost:9091/ame/api/models/validate', {fixture: 'model-validation-response.json'});
104104
const namespacesConfig = {
105105
aspectDefault: {
@@ -178,7 +178,7 @@ describe('Elements count', () => {
178178
});
179179
});
180180

181-
it('should display elements count in sidebar', () => {
181+
it.skip('should display elements count in sidebar', () => {
182182
cy.intercept('POST', 'http://localhost:9091/ame/api/models/validate', {fixture: 'model-validation-response.json'});
183183
const namespacesConfig = {
184184
aspectDefault: {

‎core/apps/ame/src/assets/i18n/en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,4 +548,4 @@
548548
}
549549
}
550550
}
551-
}
551+
}

‎core/libs/api/src/lib/model-api.service.ts‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import {inject, Injectable} from '@angular/core';
1515
import {HttpClient, HttpErrorResponse, HttpHeaders} from '@angular/common/http';
1616
import {catchError, map, mergeMap, tap, timeout} from 'rxjs/operators';
17-
import {forkJoin, Observable, of, throwError} from 'rxjs';
17+
import {forkJoin, Observable, of, switchMap, throwError} from 'rxjs';
1818
import {APP_CONFIG, AppConfig, BrowserService, FileContentModel, HttpHeaderBuilder, LogService} from '@ame/shared';
1919
import {ModelValidatorService} from './model-validator.service';
2020
import {OpenApi, ViolationError} from '@ame/editor';
@@ -171,19 +171,14 @@ export class ModelApiService {
171171
);
172172
}
173173

174-
getAllNamespacesFilesContent(exceptionFileName?: string | undefined): Observable<FileContentModel[]> {
174+
getAllNamespacesFilesContent(): Observable<FileContentModel[]> {
175175
return this.getNamespacesAppendWithFiles().pipe(
176176
map(aspectModelFileNames =>
177177
aspectModelFileNames.reduce<any[]>(
178-
(files, absoluteFileName) =>
179-
absoluteFileName !== exceptionFileName
180-
? [
181-
...files,
182-
this.getAspectMetaModel(absoluteFileName).pipe(
183-
map(aspectMetaModel => new FileContentModel(absoluteFileName, aspectMetaModel)),
184-
),
185-
]
186-
: files,
178+
(files, absoluteFileName) => [
179+
...files,
180+
this.getAspectMetaModel(absoluteFileName).pipe(map(aspectMetaModel => new FileContentModel(absoluteFileName, aspectMetaModel))),
181+
],
187182
[],
188183
),
189184
),

‎core/libs/aspect-exporter/src/lib/rdf-node/rdf-node.service.ts‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ import {BasePropertiesInterface, LocaleInterface} from './interfaces';
2424
providedIn: 'root',
2525
})
2626
export class RdfNodeService {
27-
constructor(public loggerService: LogService, public modelService: ModelService) {}
27+
constructor(
28+
public loggerService: LogService,
29+
public modelService: ModelService,
30+
) {}
2831

2932
/**
3033
* Removes the quads corresponding to the given properties of an element.
@@ -46,8 +49,8 @@ export class RdfNodeService {
4649
DataFactory.namedNode(metaModelElement.aspectModelUrn),
4750
DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(property)),
4851
null,
49-
null
50-
)?.[0]
52+
null,
53+
)?.[0],
5154
)
5255
.filter(quad => quad); // filter null/undefined
5356
}
@@ -70,7 +73,7 @@ export class RdfNodeService {
7073
const newElement = DataFactory.triple(
7174
DataFactory.namedNode(metaModelElement.aspectModelUrn),
7275
rdfModel.SAMM().RdfType(),
73-
DataFactory.namedNode(RdfModelUtil.getFullQualifiedModelName(metaModelElement))
76+
DataFactory.namedNode(RdfModelUtil.getFullQualifiedModelName(metaModelElement)),
7477
);
7578
rdfModel.store.addQuad(newElement);
7679
}
@@ -84,7 +87,7 @@ export class RdfNodeService {
8487
DataFactory.namedNode(metaModelElement.aspectModelUrn),
8588
DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(key)),
8689
null,
87-
null
90+
null,
8891
);
8992

9093
if (outdatedQuad?.length) {
@@ -114,7 +117,7 @@ export class RdfNodeService {
114117
this.addDatatype(
115118
metaModelElement,
116119
samm.getAspectModelUrn(key),
117-
encodingsList.find((el: any) => el.value === propKey).isDefinedBy
120+
encodingsList.find((el: any) => el.value === propKey).isDefinedBy,
118121
);
119122
break;
120123
}
@@ -168,8 +171,8 @@ export class RdfNodeService {
168171
DataFactory.triple(
169172
DataFactory.namedNode(metaModelElement.aspectModelUrn),
170173
DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(key)),
171-
DataFactory.literal(localeValue.value, localeValue.language)
172-
)
174+
DataFactory.literal(localeValue.value, localeValue.language),
175+
),
173176
);
174177
});
175178
break;
@@ -202,8 +205,8 @@ export class RdfNodeService {
202205
DataFactory.triple(
203206
DataFactory.namedNode(metaModelElement.aspectModelUrn),
204207
DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(key)),
205-
DataFactory.literal(localeValue.value, localeValue.language)
206-
)
208+
DataFactory.literal(localeValue.value, localeValue.language),
209+
),
207210
);
208211
});
209212
}
@@ -212,7 +215,7 @@ export class RdfNodeService {
212215
metaModelElement: BaseMetaModelElement,
213216
properties: BasePropertiesInterface,
214217
key: string,
215-
aspectModelUrn: string
218+
aspectModelUrn: string,
216219
) {
217220
const arrayProperty: string[] = properties[key];
218221
arrayProperty.forEach(property => {
@@ -224,7 +227,7 @@ export class RdfNodeService {
224227
metaModelElement: BaseMetaModelElement,
225228
aspectModelUrn: string,
226229
value: string | number | boolean,
227-
encodeUrn?: boolean
230+
encodeUrn?: boolean,
228231
) {
229232
if (!value && value !== 0) {
230233
return;
@@ -235,16 +238,16 @@ export class RdfNodeService {
235238
DataFactory.triple(
236239
DataFactory.namedNode(metaModelElement.aspectModelUrn),
237240
DataFactory.namedNode(aspectModelUrn),
238-
DataFactory.namedNode(encodeUrn ? encodeURIComponent(`${value}`) : `${value}`)
239-
)
241+
DataFactory.namedNode(encodeUrn ? encodeURIComponent(`${value}`) : `${value}`),
242+
),
240243
);
241244
}
242245

243246
private addQuad(
244247
metaModelElement: BaseMetaModelElement,
245248
value: string | number | boolean,
246249
aspectModelUrn: string,
247-
characteristicType?: Type
250+
characteristicType?: Type,
248251
) {
249252
if (!value && value !== 0) {
250253
return;
@@ -255,8 +258,8 @@ export class RdfNodeService {
255258
DataFactory.triple(
256259
DataFactory.namedNode(metaModelElement.aspectModelUrn),
257260
DataFactory.namedNode(aspectModelUrn),
258-
DataFactory.literal(`${value}`, RdfModelUtil.resolveAccurateType(metaModelElement, aspectModelUrn, rdfModel, characteristicType))
259-
)
261+
DataFactory.literal(`${value}`, RdfModelUtil.resolveAccurateType(metaModelElement, aspectModelUrn, rdfModel, characteristicType)),
262+
),
260263
);
261264
}
262265
}

‎core/libs/editor/src/lib/editor-dialog/components/fields/base/name-input-field/name-input-field.component.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* SPDX-License-Identifier: MPL-2.0
1212
*/
1313

14-
import {Component, OnDestroy, OnInit, inject} from '@angular/core';
14+
import {Component, OnDestroy, OnInit} from '@angular/core';
1515
import {FormControl, Validators} from '@angular/forms';
1616
import {
1717
BaseMetaModelElement,
@@ -26,7 +26,6 @@ import {
2626
} from '@ame/meta-model';
2727
import {EditorDialogValidators} from '../../../../validators';
2828
import {InputFieldComponent} from '../../input-field.component';
29-
import {RdfService} from '@ame/rdf/services';
3029
import {Subscription} from 'rxjs';
3130

3231
@Component({
@@ -36,7 +35,6 @@ import {Subscription} from 'rxjs';
3635
})
3736
export class NameInputFieldComponent extends InputFieldComponent<BaseMetaModelElement> implements OnInit, OnDestroy {
3837
public fieldName = 'name';
39-
private rdfService = inject(RdfService);
4038
private nameSubscription = new Subscription();
4139

4240
constructor(private validators: EditorDialogValidators) {

‎core/libs/editor/src/lib/editor-dialog/components/fields/base/see-input-field/see-input-field.component.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<span class="shape-name">{{ shape.name }}</span>
6464
<span class="shape-urn">{{ shape.aspectModelUrn }}</span>
6565
</mat-option>
66+
<mat-error class="error" *ngIf="searchControl.hasError('uri')">Invalid URI '{{ searchControl?.errors.uri.invalidUris[0] }}'</mat-error>
6667
</mat-autocomplete>
67-
68-
<mat-error *ngIf="searchControl.hasError('uri')">Invalid URI '{{ searchControl?.errors.uri.invalidUris[0] }}'</mat-error>
6968
</mat-form-field>

‎core/libs/editor/src/lib/editor-dialog/components/fields/base/see-input-field/see-input-field.component.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ mat-form-field {
3232
color: gray;
3333
}
3434
}
35+
36+
.error {
37+
padding-left: 15px;
38+
}

‎core/libs/editor/src/lib/editor-toolbar/services/file-handling.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export class FileHandlingService {
228228
this.modelSaveTracker.updateSavedModel(true);
229229

230230
const loadExternalModels$ = this.editorService
231-
.loadExternalModels(newRdfModel)
231+
.loadExternalModels()
232232
.pipe(finalize(() => loadExternalModels$.unsubscribe()))
233233
.subscribe();
234234
}

‎core/libs/editor/src/lib/editor.service.ts‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import {
4747
throwError,
4848
timer,
4949
} from 'rxjs';
50-
import {ILastSavedModel} from './editor.types';
5150
import {
5251
mxConstants,
5352
mxEvent,
@@ -235,15 +234,15 @@ export class EditorService {
235234
});
236235
}
237236

238-
loadNewAspectModel(payload: LoadModelPayload) {
237+
loadNewAspectModel(payload: LoadModelPayload): Observable<Array<RdfModel>> {
239238
this.sidebarService.workspace.refresh();
240239
this.notificationsService.info({title: 'Loading model', timeout: 2000});
241240

242241
let rdfModel: RdfModel = null;
243242
return this.rdfService.loadModel(payload.rdfAspectModel, payload.namespaceFileName || '').pipe(
244243
tap(() => this.namespaceCacheService.removeAll()),
245244
tap(loadedRdfModel => (rdfModel = loadedRdfModel)),
246-
switchMap(loadedRdfModel => this.loadExternalModels(loadedRdfModel)),
245+
switchMap(() => this.loadExternalModels()),
247246
tap(() =>
248247
this.loadCurrentModel(
249248
rdfModel,
@@ -286,21 +285,17 @@ export class EditorService {
286285
return foundCachedFile;
287286
}
288287

289-
loadExternalModels(loadedRdfModel?: RdfModel): Observable<Array<RdfModel>> {
288+
loadExternalModels(): Observable<Array<RdfModel>> {
290289
this.rdfService.externalRdfModels = [];
291-
return this.modelApiService.getAllNamespacesFilesContent(loadedRdfModel?.absoluteAspectModelFileName).pipe(
290+
return this.modelApiService.getAllNamespacesFilesContent().pipe(
292291
first(),
293292
mergeMap((fileContentModels: Array<FileContentModel>) =>
294293
fileContentModels.length
295294
? forkJoin(fileContentModels.map(fileContent => this.rdfService.loadExternalReferenceModelIntoStore(fileContent)))
296295
: of([] as Array<RdfModel>),
297296
),
298297
tap(extRdfModel => {
299-
extRdfModel.forEach(extRdfModel => {
300-
if (extRdfModel?.absoluteAspectModelFileName !== loadedRdfModel?.absoluteAspectModelFileName) {
301-
this.loadExternalAspectModel(extRdfModel.absoluteAspectModelFileName);
302-
}
303-
});
298+
extRdfModel.forEach(extRdfModel => this.loadExternalAspectModel(extRdfModel.absoluteAspectModelFileName));
304299
}),
305300
);
306301
}
@@ -338,6 +333,9 @@ export class EditorService {
338333
}
339334

340335
private loadCurrentModel(loadedRdfModel: RdfModel, rdfAspectModel: string, namespaceFileName: string, editElementUrn?: string): void {
336+
const [namespace, version, fileName] = namespaceFileName.split(':');
337+
this.namespaceCacheService.removeFile(`urn:samm:${namespace}:${version}#`, fileName);
338+
341339
this.modelService
342340
.loadRdfModel(loadedRdfModel, rdfAspectModel, namespaceFileName)
343341
.pipe(

0 commit comments

Comments
 (0)