Fineract URLs to use first item in the list as default if exists
This commit is contained in:
@@ -105,7 +105,8 @@ $color: #e2e4ec;
|
|||||||
width: $bar;
|
width: $bar;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (max-width: 768px) {
|
|
||||||
|
@media (max-width <= 768px) {
|
||||||
.container {
|
.container {
|
||||||
.search-box,
|
.search-box,
|
||||||
.filter-box,
|
.filter-box,
|
||||||
@@ -155,7 +156,8 @@ $color: #e2e4ec;
|
|||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media screen and (max-width: 768px) {
|
|
||||||
|
@media screen and (max-width > 768px) {
|
||||||
.action-button {
|
.action-button {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -54,7 +54,9 @@ export class AmazonS3Component implements OnInit {
|
|||||||
getConfigurationValue(configuration: any): string {
|
getConfigurationValue(configuration: any): string {
|
||||||
const value = configuration.value;
|
const value = configuration.value;
|
||||||
if (configuration.name === 's3_access_key' || configuration.name === 's3_secret_key') {
|
if (configuration.name === 's3_access_key' || configuration.name === 's3_secret_key') {
|
||||||
return value ? value.replace(value.substr(1, value.length - 3), value.substr(1, value.length - 3).replace(/./g, '*')) : '';
|
return value
|
||||||
|
? value.replace(value.substr(1, value.length - 3), value.substr(1, value.length - 3).replace(/./g, '*'))
|
||||||
|
: '';
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,14 +42,14 @@ const log = new Logger('MifosX');
|
|||||||
trigger('opacityScale', [
|
trigger('opacityScale', [
|
||||||
transition(':enter', [
|
transition(':enter', [
|
||||||
style({ opacity: 0, transform: 'scale(.95)' }),
|
style({ opacity: 0, transform: 'scale(.95)' }),
|
||||||
animate('100ms ease-out', style({ opacity: 1, transform: 'scale(1)' })),
|
animate('100ms ease-out', style({ opacity: 1, transform: 'scale(1)' }))]),
|
||||||
]),
|
|
||||||
transition(':leave', [
|
transition(':leave', [
|
||||||
style({ opacity: 1, transform: 'scale(1)' }),
|
style({ opacity: 1, transform: 'scale(1)' }),
|
||||||
animate('75ms ease-in', style({ opacity: 0, transform: 'scale(.95)' })),
|
animate('75ms ease-in', style({ opacity: 0, transform: 'scale(.95)' }))])
|
||||||
]),
|
|
||||||
]),
|
])
|
||||||
],
|
|
||||||
|
]
|
||||||
})
|
})
|
||||||
export class WebAppComponent implements OnInit {
|
export class WebAppComponent implements OnInit {
|
||||||
buttonConfig: KeyboardShortcutsConfiguration;
|
buttonConfig: KeyboardShortcutsConfiguration;
|
||||||
@@ -91,31 +91,30 @@ export class WebAppComponent implements OnInit {
|
|||||||
this.i18nService = new I18nService(this.translateService);
|
this.i18nService = new I18nService(this.translateService);
|
||||||
|
|
||||||
this.router.events
|
this.router.events
|
||||||
.pipe(
|
.pipe(
|
||||||
filter((event) => event instanceof NavigationEnd),
|
filter((event) => event instanceof NavigationEnd),
|
||||||
map(() => {
|
map(() => {
|
||||||
let route = this.activatedRoute;
|
let route = this.activatedRoute;
|
||||||
while (route.firstChild) {
|
while (route.firstChild) {
|
||||||
route = route.firstChild;
|
route = route.firstChild;
|
||||||
}
|
}
|
||||||
return route;
|
return route;
|
||||||
}),
|
}),
|
||||||
switchMap((route) => route.data.pipe(catchError(() => of({ title: 'APP_NAME' })))),
|
switchMap((route) => route.data.pipe(catchError(() => of({ title: 'APP_NAME' })))),
|
||||||
switchMap((data) => {
|
switchMap((data) => {
|
||||||
const rawTitle = data['title'] || 'APP_NAME';
|
const rawTitle = data['title'] || 'APP_NAME';
|
||||||
return this.translateService.get(`labels.titles.${rawTitle}`);
|
return this.translateService.get(`labels.titles.${rawTitle}`);
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
.subscribe((translatedTitle) => {
|
.subscribe((translatedTitle) => {
|
||||||
this.titleService.setTitle(translatedTitle);
|
this.titleService.setTitle(translatedTitle);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
this.alertService.alertEvent.subscribe((alertEvent: Alert) => {
|
this.alertService.alertEvent.subscribe((alertEvent: Alert) => {
|
||||||
this.snackBar.open(`${alertEvent.message}`, 'Close', {
|
this.snackBar.open(`${alertEvent.message}`, 'Close', {
|
||||||
duration: 2000,
|
duration: 2000,
|
||||||
horizontalPosition: 'right',
|
horizontalPosition: 'right',
|
||||||
verticalPosition: 'top',
|
verticalPosition: 'top'
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -126,7 +125,7 @@ export class WebAppComponent implements OnInit {
|
|||||||
if (this.authenticationService.getUserLoggedIn()) {
|
if (this.authenticationService.getUserLoggedIn()) {
|
||||||
this.alertService.alert({
|
this.alertService.alert({
|
||||||
type: 'Session timeout',
|
type: 'Session timeout',
|
||||||
message: this.translateService.instant('labels.text.Session timed out'),
|
message: this.translateService.instant('labels.text.Session timed out')
|
||||||
});
|
});
|
||||||
this.dialog.open(SessionTimeoutDialogComponent);
|
this.dialog.open(SessionTimeoutDialogComponent);
|
||||||
this.logout();
|
this.logout();
|
||||||
@@ -161,11 +160,15 @@ export class WebAppComponent implements OnInit {
|
|||||||
document.getElementById('runReport')?.click();
|
document.getElementById('runReport')?.click();
|
||||||
break;
|
break;
|
||||||
case 'cancel':
|
case 'cancel':
|
||||||
const cancelButtons = Array.from(document.querySelectorAll('button')).filter((el) => el.textContent?.trim() === 'Cancel');
|
const cancelButtons = Array.from(document.querySelectorAll('button')).filter(
|
||||||
|
(el) => el.textContent?.trim() === 'Cancel'
|
||||||
|
);
|
||||||
cancelButtons[0]?.click();
|
cancelButtons[0]?.click();
|
||||||
break;
|
break;
|
||||||
case 'submit':
|
case 'submit':
|
||||||
const submitButtons = Array.from(document.querySelectorAll('button')).filter((el) => el.textContent?.trim() === 'Submit');
|
const submitButtons = Array.from(document.querySelectorAll('button')).filter(
|
||||||
|
(el) => el.textContent?.trim() === 'Submit'
|
||||||
|
);
|
||||||
submitButtons[0]?.click();
|
submitButtons[0]?.click();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -16,7 +16,9 @@ export const environment = {
|
|||||||
loadedEnv['fineractApiUrls'] ||
|
loadedEnv['fineractApiUrls'] ||
|
||||||
'https://sandbox.mifos.community,https://demo.mifos.community,https://localhost:8443,' + window.location.origin,
|
'https://sandbox.mifos.community,https://demo.mifos.community,https://localhost:8443,' + window.location.origin,
|
||||||
// For connecting to server running elsewhere set the base API URL
|
// For connecting to server running elsewhere set the base API URL
|
||||||
baseApiUrl: loadedEnv['fineractApiUrl'] || window.location.origin,
|
baseApiUrl:
|
||||||
|
loadedEnv['fineractApiUrl'] ||
|
||||||
|
(loadedEnv['fineractApiUrls']?.length > 0 ? loadedEnv['fineractApiUrls'][0] : window.location.origin),
|
||||||
oauthServerUrl: loadedEnv['oauthServerUrl'] || loadedEnv['fineractApiUrl'] + loadedEnv['apiProvider'],
|
oauthServerUrl: loadedEnv['oauthServerUrl'] || loadedEnv['fineractApiUrl'] + loadedEnv['apiProvider'],
|
||||||
allowServerSwitch: env.allow_switching_backend_instance,
|
allowServerSwitch: env.allow_switching_backend_instance,
|
||||||
apiProvider: loadedEnv['apiProvider'] || '/fineract-provider/api',
|
apiProvider: loadedEnv['apiProvider'] || '/fineract-provider/api',
|
||||||
|
|||||||
@@ -21,7 +21,9 @@ export const environment = {
|
|||||||
loadedEnv['fineractApiUrls'] ||
|
loadedEnv['fineractApiUrls'] ||
|
||||||
'https://sandbox.mifos.community,https://demo.mifos.community,https://localhost:8443,' + window.location.origin,
|
'https://sandbox.mifos.community,https://demo.mifos.community,https://localhost:8443,' + window.location.origin,
|
||||||
// For connecting to server running elsewhere set the base API URL
|
// For connecting to server running elsewhere set the base API URL
|
||||||
baseApiUrl: loadedEnv['baseApiUrl'] || window.location.origin,
|
baseApiUrl:
|
||||||
|
loadedEnv['fineractApiUrl'] ||
|
||||||
|
(loadedEnv['fineractApiUrls']?.length > 0 ? loadedEnv['fineractApiUrls'][0] : window.location.origin),
|
||||||
allowServerSwitch: env.allow_switching_backend_instance,
|
allowServerSwitch: env.allow_switching_backend_instance,
|
||||||
apiProvider: loadedEnv['apiProvider'] || '/fineract-provider/api',
|
apiProvider: loadedEnv['apiProvider'] || '/fineract-provider/api',
|
||||||
apiVersion: loadedEnv['apiVersion'] || '/v1',
|
apiVersion: loadedEnv['apiVersion'] || '/v1',
|
||||||
|
|||||||
Reference in New Issue
Block a user