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.

Sign up for GitHub

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

fix(dsp-das): Enables rich text saving when creating new text value f… #1417

Merged
merged 6 commits into from
Jan 31, 2024
Merged

fix(dsp-das): Enables rich text saving when creating new text value f… #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d48bf85
fix(dsp-das): Enables rich text saving when creating new text value f…
irmastnt Jan 31, 2024
d4d2a03
Merge branch 'main' into feature/dev-3247-saving-a-new-value-for-rich…
irmastnt Jan 31, 2024
4985a80
Merge branch 'main' into feature/dev-3247-saving-a-new-value-for-rich…
irmastnt Jan 31, 2024
233c32c
Merge branch 'main' into feature/dev-3247-saving-a-new-value-for-rich…
irmastnt Jan 31, 2024
46693bd
Merge branch 'main' into feature/dev-3247-saving-a-new-value-for-rich…
irmastnt Jan 31, 2024
f2005c1
fixed tests
irmastnt Jan 31, 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 apps/dsp-app/src/app/workspace/resource/operations/add-value/add-value.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export class AddValueComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
setTimeout(() => {
this.createModeActive = true;
this._cd.markForCheck();
}, 0);
}

Expand Down
10 changes: 5 additions & 5 deletions libs/vre/shared/app-config/src/lib/app-config/app-config.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe('AppConfigService with dev config', () => {
geonameToken: 'geoname_token',
iriBase: 'http://rdfh.ch',
instrumentation: {
environment: 'dev',
environment: 'local-dev',
rollbar: {
enabled: false,
},
Expand All @@ -50,7 +50,7 @@ describe('AppConfigService with dev config', () => {
});

it('should process the fully specified config (dev mode)', async () => {
expect(service.dspConfig.environment).toEqual('dev');
expect(service.dspConfig.environment).toEqual('local-dev');
expect(service.dspConfig.color).toEqual('accent');
expect(service.dspConfig.production).toEqual(false);
expect(service.dspApiConfig.apiProtocol).toEqual('http');
Expand All @@ -65,7 +65,7 @@ describe('AppConfigService with dev config', () => {
expect(service.dspApiConfig.logErrors).toEqual(true);
expect(service.dspAppConfig.geonameToken).toEqual('geoname_token');
expect(service.dspAppConfig.iriBase).toEqual('http://rdfh.ch');
expect(service.dspInstrumentationConfig.environment).toEqual('dev');
expect(service.dspInstrumentationConfig.environment).toEqual('local-dev');
expect(service.dspInstrumentationConfig.rollbar.enabled).toEqual(false);
expect(service.dspInstrumentationConfig.rollbar.accessToken).toBeUndefined();
});
Expand Down Expand Up @@ -115,7 +115,7 @@ describe('AppConfigService with prod config', () => {

it('should process the fully specified config (prod mode)', async () => {
expect(service.dspConfig.release).toEqual('2023.04.02');
expect(service.dspConfig.environment).toEqual('production');
expect(service.dspConfig.environment).toEqual('prod');
expect(service.dspConfig.color).toEqual('primary');
expect(service.dspConfig.production).toEqual(true);
expect(service.dspApiConfig.apiProtocol).toEqual('https');
Expand All @@ -130,7 +130,7 @@ describe('AppConfigService with prod config', () => {
expect(service.dspApiConfig.logErrors).toEqual(true);
expect(service.dspAppConfig.geonameToken).toEqual('geoname_token');
expect(service.dspAppConfig.iriBase).toEqual('http://rdfh.ch');
expect(service.dspInstrumentationConfig.environment).toEqual('production');
expect(service.dspInstrumentationConfig.environment).toEqual('prod');
expect(service.dspInstrumentationConfig.rollbar.enabled).toEqual(true);
expect(service.dspInstrumentationConfig.rollbar.accessToken).toEqual('rollbar_token');
});
Expand Down
Loading