Skip to content
Snippets Groups Projects
Commit b6f6d936 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-7128 cleanup

parent acd5e6ef
No related branches found
No related tags found
No related merge requests found
Showing
with 30 additions and 30 deletions
......@@ -802,7 +802,7 @@ Map getUserManagerEnv(String namespace, dbPort){
}
Map getUserManagerDatabaseSecret(String namespace) {
return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
Void sendFailureMessage() {
......
......@@ -419,7 +419,7 @@ Map getUserManagerEnv(String namespace, dbPort){
}
Map getUserManagerDatabaseSecret(String namespace) {
return readJSON(text: sh(script: "kubectl get secret ozg-mongodb-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
return readJSON(text: sh(script: "kubectl get secret ozg-mongodb-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
String makePasswordUrlConform(String password) {
......
import { ROUTES } from '@admin-client/admin-shared';
import { ROUTES } from '@admin-client/shared';
import { Route } from '@angular/router';
import { OrganisationsEinheitFormPageComponent } from '../pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component';
import { OrganisationsEinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
......
......@@ -2,11 +2,7 @@ import { EnvironmentModule, loadEnvironment } from '@alfa-client/environment-sha
import { enableProdMode, importProvidersFrom } from '@angular/core';
import { isNil } from 'lodash-es';
import { ConfigurationModule } from '@admin-client/admin-configuration';
import { OrganisationseinheitModule } from '@admin-client/admin-organisationseinheit';
import { PostfachModule } from '@admin-client/admin-postfach';
import { AdminSettingsModule } from '@admin-client/admin-settings';
import { UserModule } from '@admin-client/admin-user';
import { UserProviders } from '@admin-client/user';
import { ApiRootModule } from '@alfa-client/api-root-shared';
import { NavigationSharedModule } from '@alfa-client/navigation-shared';
import { registerLocaleData } from '@angular/common';
......@@ -21,6 +17,10 @@ import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { OAuthModule } from 'angular-oauth2-oidc';
import { HttpUnauthorizedInterceptor } from 'authentication';
import { ConfigurationsProviders } from '../../../libs/admin/configuration/src/lib/configuration.providers';
import { OrganisationEinheitProviders } from '../../../libs/admin/organisationseinheit/src/lib/organisations-einheit.providers';
import { PostfachProviders } from '../../../libs/admin/postfach/src/lib/postfach.providers';
import { SettingsProviders } from '../../../libs/admin/settings/src/lib/settings.providers';
import { AppComponent } from './app/app.component';
import { appRoutes } from './app/app.routes';
import { environment } from './environments/environment';
......@@ -39,12 +39,12 @@ loadEnvironment(environment.environmentUrl).then((env) => {
bootstrapApplication(AppComponent, {
providers: [
ConfigurationsProviders,
PostfachProviders,
SettingsProviders,
OrganisationEinheitProviders,
UserProviders,
importProvidersFrom(
UserModule,
AdminSettingsModule,
PostfachModule,
OrganisationseinheitModule,
ConfigurationModule,
NavigationSharedModule,
BrowserModule,
ApiRootModule,
......
<admin-organisationseinheit-form-container/>
\ No newline at end of file
<organisations-einheit-form-container/>
\ No newline at end of file
import { OrganisationsEinheitFormContainerComponent } from '@admin-client/admin-organisationseinheit';
import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { OrganisationsEinheitFormPageComponent } from './organisationseinheit-form-page.component';
......
import { OrganisationsEinheitFormContainerComponent } from '@admin-client/admin-organisationseinheit';
import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
import { Component } from '@angular/core';
@Component({
......
<admin-organisationseinheit-container/>
<organisations-einheit-container/>
import { OrganisationsEinheitContainerComponent } from '@admin-client/admin-organisationseinheit';
import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { OrganisationsEinheitPageComponent } from './organisationseinheit-page.component';
......
import { OrganisationsEinheitContainerComponent } from '@admin-client/admin-organisationseinheit';
import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
import { Component } from '@angular/core';
@Component({
......
<admin-postfach-container />
<postfach-container />
import { PostfachContainerComponent } from '@admin-client/admin-postfach';
import { PostfachContainerComponent } from '@admin-client/postfach';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { PostfachPageComponent } from './postfach-page.component';
......
import { PostfachContainerComponent } from '@admin-client/admin-postfach';
import { PostfachContainerComponent } from '@admin-client/postfach';
import { Component } from '@angular/core';
@Component({
......
<admin-user-add-form />
<user-add-form />
import { UserAddFormComponent } from '@admin-client/admin-user';
import { UserAddFormComponent } from '@admin-client/user';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { UserAddPageComponent } from './user-add-page.component';
......
import { UserAddFormComponent } from '@admin-client/admin-user';
import { UserAddFormComponent } from '@admin-client/user';
import { Component } from '@angular/core';
@Component({
......
<admin-users-roles />
\ No newline at end of file
<users-roles />
\ No newline at end of file
import { UsersRolesComponent } from '@admin-client/admin-user';
import { UsersRolesComponent } from '@admin-client/user';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { UserRolesPageComponent } from './user-roles-page.component';
......
import { UsersRolesComponent } from '@admin-client/admin-user';
import { UsersRolesComponent } from '@admin-client/user';
import { Component } from '@angular/core';
@Component({
......
# admin-configuration
# configuration
This library was generated with [Nx](https://nx.dev).
## Running unit tests
Run `nx test admin-configuration` to execute the unit tests.
Run `nx test configuration` to execute the unit tests.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment