Skip to content

Commit d2a12ce

Browse files
Merge pull request #2767 from ReliefApplications/beta
Beta
2 parents 29362d4 + 2c3c788 commit d2a12ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+269
-181
lines changed

.cspell.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"words": [
3+
"casl",
4+
"geoman",
5+
"leafletgeocoder",
6+
"leafletgeoman",
7+
"markercluster",
8+
"geocoder",
9+
"leaftletmeasure",
10+
"gridster",
11+
"maplibre",
12+
"webmap"
13+
],
14+
"ignorePaths": ["apps/**/*/project.json", "apps/**/*/documentation.json"]
15+
}

apps/back-office/src/app/app.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
LoggerService,
1414
CsDocsPropertiesDropdownComponent,
1515
AcceptedValueTypesTextComponent,
16+
CommonServicesService,
1617
} from '@oort-front/shared';
1718

1819
/**
@@ -46,10 +47,12 @@ export class AppComponent implements OnInit {
4647
*
4748
* @param authService Shared authentication service
4849
* @param logger Shared logger service ( initialize logger so its subscription can start )
50+
* @param csService Common Services connector ( initialize service to create client )
4951
*/
5052
constructor(
5153
private authService: AuthService,
52-
private logger: LoggerService
54+
private logger: LoggerService,
55+
private csService: CommonServicesService
5356
) {}
5457

5558
/**

apps/back-office/src/app/dashboard/pages/api-configurations/api-configurations.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
SpinnerModule,
1717
SelectMenuModule,
1818
TableModule,
19-
DialogModule as DialgModule,
19+
DialogModule as UiDialogModule,
2020
FormWrapperModule,
2121
PaginatorModule,
2222
ErrorMessageModule,
@@ -47,7 +47,7 @@ describe('ApiConfigurationsComponent', () => {
4747
FormWrapperModule,
4848
PaginatorModule,
4949
ErrorMessageModule,
50-
DialgModule,
50+
UiDialogModule,
5151
SkeletonTableModule,
5252
FormsModule,
5353
TranslateModule.forRoot({

apps/back-office/src/app/dashboard/pages/dashboard/dashboard.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export class DashboardComponent
113113
/** Is edition active */
114114
@HostBinding('class.edit-mode-dashboard')
115115
public editionActive = true;
116-
/** If we are visualising a new template */
116+
/** If we are visualizing a new template */
117117
public templateMode = false;
118118
/** Additional grid configuration */
119119
public gridOptions: GridsterConfig = {};

apps/back-office/src/app/dashboard/pages/pull-jobs/graphql/queries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { gql } from 'apollo-angular';
22

33
// === GET PULL JOBS ===
44

5-
/** Graphql queryfor getting multiple pull job objects with a cursor */
5+
/** Graphql query for getting multiple pull job objects with a cursor */
66
export const GET_PULL_JOBS = gql`
77
query GetPullJobs($first: Int, $afterCursor: ID) {
88
pullJobs(first: $first, afterCursor: $afterCursor) {

apps/back-office/src/app/dashboard/pages/reference-data/graphql/queries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const GET_API_CONFIGURATION = gql`
6161
}
6262
`;
6363

64-
// === GET API CONFGIURATIONS NAME ===
64+
// === GET API CONFIGURATIONS NAME ===
6565
/** API configuration names query */
6666
export const GET_API_CONFIGURATIONS_NAMES = gql`
6767
query GetApiConfigurationsName($first: Int, $afterCursor: ID, $filter: JSON) {

apps/back-office/src/environments/environment.azure.dev.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { Environment } from './environment.type';
77
* Authentication configuration
88
*/
99
const authConfig: AuthConfig = {
10+
/* cSpell:disable */
1011
issuer:
1112
'https://login.microsoftonline.com/f610c0b7-bd24-4b39-810b-3dc280afb590/v2.0',
1213
redirectUri: 'https://hems-dev.who.int/backoffice/',
@@ -18,12 +19,14 @@ const authConfig: AuthConfig = {
1819
responseType: 'code',
1920
showDebugInformation: true,
2021
strictDiscoveryDocumentValidation: false,
22+
/* cSpell:enable */
2123
};
2224

2325
/**
2426
* Environment file for local development.
2527
*/
2628
export const environment: Environment = {
29+
/* cSpell:disable */
2730
...sharedEnvironment,
2831
production: true,
2932
href: '/backoffice',
@@ -60,4 +63,5 @@ export const environment: Environment = {
6063
admin0Url: 'https://hems-dev.who.int/app-builder/admin0.json',
6164
csApiUrl: 'https://hems-dev.who.int/csapi/api',
6265
csDocUrl: 'https://hems-dev.who.int/csdocui',
66+
/* cSpell:enable */
6367
};

apps/back-office/src/environments/environment.azure.prod.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import { sharedEnvironment } from './environment.shared';
44
import { Environment } from './environment.type';
55

66
/**
7-
* Authentification configuration
7+
* Authentication configuration
88
*/
99
const authConfig: AuthConfig = {
10+
/* cSpell:disable */
1011
issuer:
1112
'https://login.microsoftonline.com/f610c0b7-bd24-4b39-810b-3dc280afb590/v2.0',
1213
redirectUri: 'https://hems.who.int/backoffice/',
@@ -18,12 +19,14 @@ const authConfig: AuthConfig = {
1819
responseType: 'code',
1920
showDebugInformation: true,
2021
strictDiscoveryDocumentValidation: false,
22+
/* cSpell:enable */
2123
};
2224

2325
/**
2426
* Environment file for local development.
2527
*/
2628
export const environment: Environment = {
29+
/* cSpell:disable */
2730
...sharedEnvironment,
2831
production: true,
2932
href: '/backoffice',
@@ -55,4 +58,5 @@ export const environment: Environment = {
5558
admin0Url: 'https://hems.who.int/app-builder/admin0.json',
5659
csApiUrl: 'https://hems.who.int/csapi/api',
5760
csDocUrl: 'https://hems.who.int/csdocui',
61+
/* cSpell:enable */
5862
};

apps/back-office/src/environments/environment.azure.uat.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { Environment } from './environment.type';
77
* Authentication configuration
88
*/
99
const authConfig: AuthConfig = {
10+
/* cSpell:disable */
1011
issuer:
1112
'https://login.microsoftonline.com/f610c0b7-bd24-4b39-810b-3dc280afb590/v2.0',
1213
redirectUri: 'https://hems-test.who.int/backoffice/',
@@ -18,12 +19,14 @@ const authConfig: AuthConfig = {
1819
responseType: 'code',
1920
showDebugInformation: true,
2021
strictDiscoveryDocumentValidation: false,
22+
/* cSpell:enable */
2123
};
2224

2325
/**
2426
* Environment file for local development.
2527
*/
2628
export const environment: Environment = {
29+
/* cSpell:disable */
2730
...sharedEnvironment,
2831
production: true,
2932
href: '/backoffice',
@@ -55,4 +58,5 @@ export const environment: Environment = {
5558
admin0Url: 'https://hems-test.who.int/app-builder/admin0.json',
5659
csApiUrl: 'https://hems-test.who.int/csapi/api',
5760
csDocUrl: 'https://hems-test.who.int/csdocui',
61+
/* cSpell:enable */
5862
};

apps/back-office/src/environments/environment.oort.demo.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@ import { sharedEnvironment } from './environment.shared';
44
import { Environment } from './environment.type';
55

66
/**
7-
* Authentification configuration
7+
* Authentication configuration
88
*/
99
const authConfig: AuthConfig = {
10+
/* cSpell:disable */
1011
issuer: 'https://id.oortcloud.tech/auth/realms/oort-demo',
1112
redirectUri: 'https://demo.oortcloud.tech/admin/',
1213
postLogoutRedirectUri: 'https://demo.oortcloud.tech/admin/auth/',
1314
clientId: 'oort-client',
1415
scope: 'openid profile email offline_access',
1516
responseType: 'code',
1617
showDebugInformation: true,
18+
/* cSpell:enable */
1719
};
1820

1921
/**
2022
* Environment file for local development.
2123
*/
2224
export const environment: Environment = {
25+
/* cSpell:disable */
2326
...sharedEnvironment,
2427
production: true,
2528
apiUrl: 'https://demo.oortcloud.tech/api',
@@ -40,4 +43,5 @@ export const environment: Environment = {
4043
'text',
4144
'map',
4245
],
46+
/* cSpell:enable */
4347
};

0 commit comments

Comments
 (0)