diff --git a/src/app/product-store/app-detail/app-detail.component.spec.ts b/src/app/product-store/app-detail/app-detail.component.spec.ts
index d42664e..d6b1309 100644
--- a/src/app/product-store/app-detail/app-detail.component.spec.ts
+++ b/src/app/product-store/app-detail/app-detail.component.spec.ts
@@ -27,6 +27,8 @@ const form = new FormGroup
({
type: new FormControl(''),
remoteBaseUrl: new FormControl(''),
remoteEntry: new FormControl(''),
+ remoteName: new FormControl(''),
+ tagName: new FormControl(''),
exposedModule: new FormControl(''),
classifications: new FormControl(''),
contact: new FormControl(''),
@@ -50,6 +52,8 @@ const mfe: Microfrontend = {
productName: 'productName',
appVersion: 'version',
remoteEntry: 'entry',
+ remoteName: 'remoteName',
+ tagName: 'tagName',
description: 'description',
technology: 'technology',
type: MicrofrontendType.Module,
@@ -241,348 +245,362 @@ describe('AppDetailComponent', () => {
expect(component.appChanged.emit).toHaveBeenCalledWith(false)
})
- it('should display error if form is invalid onSave', () => {
- component.appAbstract = appMfe
- component.formGroupMfe = new FormGroup({
- appId: new FormControl('i', Validators.minLength(2)),
- appName: new FormControl(''),
- appVersion: new FormControl(''),
- productName: new FormControl(''),
- description: new FormControl(''),
- technology: new FormControl(''),
- type: new FormControl(''),
- remoteBaseUrl: new FormControl(''),
- remoteEntry: new FormControl(''),
- exposedModule: new FormControl(''),
- classifications: new FormControl(''),
- contact: new FormControl(''),
- iconName: new FormControl(''),
- note: new FormControl('')
+ describe('onSave', () => {
+ it('should display error if form is invalid onSave', () => {
+ component.appAbstract = appMfe
+ component.formGroupMfe = new FormGroup({
+ appId: new FormControl('i', Validators.minLength(2)),
+ appName: new FormControl(''),
+ appVersion: new FormControl(''),
+ productName: new FormControl(''),
+ description: new FormControl(''),
+ technology: new FormControl(''),
+ type: new FormControl(''),
+ remoteBaseUrl: new FormControl(''),
+ remoteEntry: new FormControl(''),
+ remoteName: new FormControl(''),
+ tagName: new FormControl(''),
+ exposedModule: new FormControl(''),
+ classifications: new FormControl(''),
+ contact: new FormControl(''),
+ iconName: new FormControl(''),
+ note: new FormControl('')
+ })
+ component.changeMode = 'CREATE'
+
+ component.onSave()
+
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({ summaryKey: 'VALIDATION.FORM_INVALID' })
})
- component.changeMode = 'CREATE'
-
- component.onSave()
-
- expect(msgServiceSpy.error).toHaveBeenCalledWith({ summaryKey: 'VALIDATION.FORM_INVALID' })
- })
- it('should call createApp onSave in create mode', () => {
- mfeApiServiceSpy.createMicrofrontend.and.returnValue(of({}))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'CREATE'
+ it('should call createApp onSave in create mode', () => {
+ mfeApiServiceSpy.createMicrofrontend.and.returnValue(of({}))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'CREATE'
- component.onSave()
+ component.onSave()
- expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.CREATE.APP.OK' })
- })
+ expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.CREATE.APP.OK' })
+ })
- it('should display save error in create mode', () => {
- const err = {
- error: {
- detail: 'Error',
- errorCode: 'PERSIST_ENTITY_FAILED'
+ it('should display save error in create mode', () => {
+ const err = {
+ error: {
+ detail: 'Error',
+ errorCode: 'PERSIST_ENTITY_FAILED'
+ }
}
- }
- mfeApiServiceSpy.createMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'CREATE'
-
- component.onSave()
-
- const expectedKey = ''
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.CREATE.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.createMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'CREATE'
+
+ component.onSave()
+
+ const expectedKey = ''
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.CREATE.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should call updateApp onSave in edit mode', () => {
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(of({}))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
+ it('should call updateApp onSave in edit mode', () => {
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(of({}))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
- component.onSave()
+ component.onSave()
- expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.EDIT.APP.OK' })
- })
+ expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.EDIT.APP.OK' })
+ })
- it('should display save error in edit mode: unique constraint mfe id', () => {
- const err = {
- error: {
- detail: 'error: microfrontend_app_id',
- errorCode: 'PERSIST_ENTITY_FAILED'
+ it('should display save error in edit mode: unique constraint mfe id', () => {
+ const err = {
+ error: {
+ detail: 'error: microfrontend_app_id',
+ errorCode: 'PERSIST_ENTITY_FAILED'
+ }
}
- }
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
-
- component.onSave()
-
- const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.APP_ID'
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.EDIT.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
+
+ component.onSave()
+
+ const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.APP_ID'
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.EDIT.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should display save error in edit mode: unique constraint mfe id', () => {
- const err = {
- error: {
- detail: 'error: microfrontend_remote_module',
- errorCode: 'PERSIST_ENTITY_FAILED'
+ it('should display save error in edit mode: unique constraint mfe id', () => {
+ const err = {
+ error: {
+ detail: 'error: microfrontend_remote_module',
+ errorCode: 'PERSIST_ENTITY_FAILED'
+ }
}
- }
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
-
- component.onSave()
-
- const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.REMOTE_MODULE'
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.EDIT.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
+
+ component.onSave()
+
+ const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.REMOTE_MODULE'
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.EDIT.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should display save error in edit mode: other internal error', () => {
- const err = {
- error: {
- detail: 'error: microfrontend_remote_module',
- errorCode: 'other'
+ it('should display save error in edit mode: other internal error', () => {
+ const err = {
+ error: {
+ detail: 'error: microfrontend_remote_module',
+ errorCode: 'other'
+ }
}
- }
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
-
- component.onSave()
-
- const expectedKey = 'VALIDATION.ERRORS.INTERNAL_ERROR'
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.EDIT.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
+
+ component.onSave()
+
+ const expectedKey = 'VALIDATION.ERRORS.INTERNAL_ERROR'
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.EDIT.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should display error if form is invalid onSave', () => {
- component.appAbstract = appMfe
- component.formGroupMfe = new FormGroup({
- appId: new FormControl('i', Validators.minLength(2)),
- appName: new FormControl(''),
- appVersion: new FormControl(''),
- productName: new FormControl(''),
- description: new FormControl(''),
- technology: new FormControl(''),
- type: new FormControl(''),
- remoteBaseUrl: new FormControl(''),
- remoteEntry: new FormControl(''),
- exposedModule: new FormControl(''),
- classifications: new FormControl(''),
- contact: new FormControl(''),
- iconName: new FormControl(''),
- note: new FormControl('')
+ it('should display error if form is invalid onSave', () => {
+ component.appAbstract = appMfe
+ component.formGroupMfe = new FormGroup({
+ appId: new FormControl('i', Validators.minLength(2)),
+ appName: new FormControl(''),
+ appVersion: new FormControl(''),
+ productName: new FormControl(''),
+ description: new FormControl(''),
+ technology: new FormControl(''),
+ type: new FormControl(''),
+ remoteBaseUrl: new FormControl(''),
+ remoteEntry: new FormControl(''),
+ remoteName: new FormControl(''),
+ tagName: new FormControl(''),
+ exposedModule: new FormControl(''),
+ classifications: new FormControl(''),
+ contact: new FormControl(''),
+ iconName: new FormControl(''),
+ note: new FormControl('')
+ })
+ component.changeMode = 'CREATE'
+
+ component.onSave()
+
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({ summaryKey: 'VALIDATION.FORM_INVALID' })
})
- component.changeMode = 'CREATE'
-
- component.onSave()
-
- expect(msgServiceSpy.error).toHaveBeenCalledWith({ summaryKey: 'VALIDATION.FORM_INVALID' })
- })
- it('should call createApp onSave in create mode', () => {
- mfeApiServiceSpy.createMicrofrontend.and.returnValue(of({}))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'CREATE'
+ it('should call createApp onSave in create mode', () => {
+ mfeApiServiceSpy.createMicrofrontend.and.returnValue(of({}))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'CREATE'
- component.onSave()
+ component.onSave()
- expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.CREATE.APP.OK' })
- })
+ expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.CREATE.APP.OK' })
+ })
- it('should display save error in create mode', () => {
- const err = {
- error: {
- detail: 'Error',
- errorCode: 'PERSIST_ENTITY_FAILED'
+ it('should display save error in create mode', () => {
+ const err = {
+ error: {
+ detail: 'Error',
+ errorCode: 'PERSIST_ENTITY_FAILED'
+ }
}
- }
- mfeApiServiceSpy.createMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'CREATE'
-
- component.onSave()
-
- const expectedKey = ''
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.CREATE.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.createMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'CREATE'
+
+ component.onSave()
+
+ const expectedKey = ''
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.CREATE.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should call updateApp onSave in edit mode', () => {
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(of({}))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
+ it('should call updateApp onSave in edit mode', () => {
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(of({}))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
- component.onSave()
+ component.onSave()
- expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.EDIT.APP.OK' })
- })
+ expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.EDIT.APP.OK' })
+ })
- it('should display save error in edit mode: unique constraint mfe id', () => {
- const err = {
- error: {
- detail: 'error: microfrontend_app_id',
- errorCode: 'PERSIST_ENTITY_FAILED'
+ it('should display save error in edit mode: unique constraint mfe id', () => {
+ const err = {
+ error: {
+ detail: 'error: microfrontend_app_id',
+ errorCode: 'PERSIST_ENTITY_FAILED'
+ }
}
- }
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
-
- component.onSave()
-
- const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.APP_ID'
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.EDIT.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
+
+ component.onSave()
+
+ const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.APP_ID'
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.EDIT.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should display save error in edit mode: unique constraint mfe id', () => {
- const err = {
- error: {
- detail: 'error: microfrontend_remote_module',
- errorCode: 'PERSIST_ENTITY_FAILED'
+ it('should display save error in edit mode: unique constraint mfe id', () => {
+ const err = {
+ error: {
+ detail: 'error: microfrontend_remote_module',
+ errorCode: 'PERSIST_ENTITY_FAILED'
+ }
}
- }
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
-
- component.onSave()
-
- const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.REMOTE_MODULE'
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.EDIT.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
+
+ component.onSave()
+
+ const expectedKey = 'VALIDATION.APP.UNIQUE_CONSTRAINT.REMOTE_MODULE'
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.EDIT.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should display save error in edit mode: other internal error', () => {
- const err = {
- error: {
- detail: 'error: microfrontend_remote_module',
- errorCode: 'other'
+ it('should display save error in edit mode: other internal error', () => {
+ const err = {
+ error: {
+ detail: 'error: microfrontend_remote_module',
+ errorCode: 'other'
+ }
}
- }
- mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
- component.appAbstract = appMfe
- component.formGroupMfe = form
- component.changeMode = 'EDIT'
-
- component.onSave()
-
- const expectedKey = 'VALIDATION.ERRORS.INTERNAL_ERROR'
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.EDIT.APP.NOK',
- detailKey: expectedKey
+ mfeApiServiceSpy.updateMicrofrontend.and.returnValue(throwError(() => err))
+ component.appAbstract = appMfe
+ component.formGroupMfe = form
+ component.changeMode = 'EDIT'
+
+ component.onSave()
+
+ const expectedKey = 'VALIDATION.ERRORS.INTERNAL_ERROR'
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.EDIT.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- // ONSAVE TESTS FOR MSS
- it('should display error if form is invalid onSave', () => {
- component.appAbstract = appMs
- component.formGroupMs = new FormGroup({
- appId: new FormControl('i', Validators.minLength(2)),
- appName: new FormControl(''),
- appVersion: new FormControl(''),
- productName: new FormControl(''),
- description: new FormControl('')
+ // ONSAVE TESTS FOR MSS
+ it('should display error if form is invalid onSave', () => {
+ component.appAbstract = appMs
+ component.formGroupMs = new FormGroup({
+ appId: new FormControl('i', Validators.minLength(2)),
+ appName: new FormControl(''),
+ appVersion: new FormControl(''),
+ productName: new FormControl(''),
+ description: new FormControl('')
+ })
+ component.changeMode = 'CREATE'
+
+ component.onSave()
+
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({ summaryKey: 'VALIDATION.FORM_INVALID' })
})
- component.changeMode = 'CREATE'
-
- component.onSave()
-
- expect(msgServiceSpy.error).toHaveBeenCalledWith({ summaryKey: 'VALIDATION.FORM_INVALID' })
- })
- it('should call createApp onSave in create mode', () => {
- msApiServiceSpy.createMicroservice.and.returnValue(of({}))
- component.appAbstract = appMs
- component.formGroupMs = msForm
- component.changeMode = 'CREATE'
+ it('should call createApp onSave in create mode', () => {
+ msApiServiceSpy.createMicroservice.and.returnValue(of({}))
+ component.appAbstract = appMs
+ component.formGroupMs = msForm
+ component.changeMode = 'CREATE'
- component.onSave()
+ component.onSave()
- expect(component.formGroupMs.valid).toBeTrue()
- expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.CREATE.APP.OK' })
- })
+ expect(component.formGroupMs.valid).toBeTrue()
+ expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.CREATE.APP.OK' })
+ })
- it('should display save error in create mode', () => {
- const err = {
- error: {
- detail: 'Error',
- errorCode: 'PERSIST_ENTITY_FAILED'
+ it('should display save error in create mode', () => {
+ const err = {
+ error: {
+ detail: 'Error',
+ errorCode: 'PERSIST_ENTITY_FAILED'
+ }
}
- }
- msApiServiceSpy.createMicroservice.and.returnValue(throwError(() => err))
- component.appAbstract = appMs
- component.formGroupMs = msForm
- component.changeMode = 'CREATE'
-
- component.onSave()
-
- const expectedKey = ''
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.CREATE.APP.NOK',
- detailKey: expectedKey
+ msApiServiceSpy.createMicroservice.and.returnValue(throwError(() => err))
+ component.appAbstract = appMs
+ component.formGroupMs = msForm
+ component.changeMode = 'CREATE'
+
+ component.onSave()
+
+ const expectedKey = ''
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.CREATE.APP.NOK',
+ detailKey: expectedKey
+ })
})
- })
- it('should call updateApp onSave in edit mode', () => {
- msApiServiceSpy.updateMicroservice.and.returnValue(of({}))
- component.appAbstract = appMs
- component.formGroupMs = msForm
- component.changeMode = 'EDIT'
+ it('should call updateApp onSave in edit mode', () => {
+ msApiServiceSpy.updateMicroservice.and.returnValue(of({}))
+ component.appAbstract = appMs
+ component.formGroupMs = msForm
+ component.changeMode = 'EDIT'
- component.onSave()
+ component.onSave()
- expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.EDIT.APP.OK' })
- })
+ expect(msgServiceSpy.success).toHaveBeenCalledWith({ summaryKey: 'ACTIONS.EDIT.APP.OK' })
+ })
- it('should display save error in edit mode: other internal error', () => {
- const err = {
- error: {
- detail: 'error: microservice_remote_module',
- errorCode: 'other'
+ it('should display save error in edit mode: other internal error', () => {
+ const err = {
+ error: {
+ detail: 'error: microservice_remote_module',
+ errorCode: 'other'
+ }
}
- }
- msApiServiceSpy.updateMicroservice.and.returnValue(throwError(() => err))
- component.appAbstract = appMs
- component.formGroupMs = msForm
- component.changeMode = 'EDIT'
+ msApiServiceSpy.updateMicroservice.and.returnValue(throwError(() => err))
+ component.appAbstract = appMs
+ component.formGroupMs = msForm
+ component.changeMode = 'EDIT'
+
+ component.onSave()
+
+ const expectedKey = 'VALIDATION.ERRORS.INTERNAL_ERROR'
+ expect(msgServiceSpy.error).toHaveBeenCalledWith({
+ summaryKey: 'ACTIONS.EDIT.APP.NOK',
+ detailKey: expectedKey
+ })
+ })
+ })
- component.onSave()
+ it('should update tabIndex onTabPanelChange', () => {
+ const mockEvent = { index: 3 }
- const expectedKey = 'VALIDATION.ERRORS.INTERNAL_ERROR'
- expect(msgServiceSpy.error).toHaveBeenCalledWith({
- summaryKey: 'ACTIONS.EDIT.APP.NOK',
- detailKey: expectedKey
- })
+ component.onTabPanelChange(mockEvent)
+
+ expect(component.tabIndex).toBe(mockEvent.index)
})
it('should call this.user.lang$ from the constructor and set this.dateFormat to the default format if user.lang$ is not de', () => {
diff --git a/src/app/product-store/app-detail/app-detail.component.ts b/src/app/product-store/app-detail/app-detail.component.ts
index 8c5c233..dc78487 100644
--- a/src/app/product-store/app-detail/app-detail.component.ts
+++ b/src/app/product-store/app-detail/app-detail.component.ts
@@ -1,8 +1,9 @@
-import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, Renderer2, ViewChild } from '@angular/core'
import { FormControl, FormGroup, Validators } from '@angular/forms'
import { TranslateService } from '@ngx-translate/core'
import { finalize } from 'rxjs'
import { SelectItem } from 'primeng/api'
+import { TabView } from 'primeng/tabview'
import { PortalMessageService, UserService } from '@onecx/portal-integration-angular'
import { IconService } from 'src/app/shared/iconservice'
@@ -31,7 +32,9 @@ export interface MfeForm {
technology: FormControl
type: FormControl
remoteBaseUrl: FormControl
+ remoteName: FormControl
remoteEntry: FormControl
+ tagName: FormControl
classifications: FormControl
contact?: FormControl
iconName?: FormControl
@@ -51,28 +54,27 @@ export interface MsForm {
templateUrl: './app-detail.component.html',
styleUrls: ['./app-detail.component.scss']
})
-export class AppDetailComponent implements OnChanges {
+export class AppDetailComponent implements OnInit, OnChanges {
@Input() appAbstract: AppAbstract | undefined
@Input() dateFormat = 'medium'
@Input() changeMode: ChangeMode = 'VIEW'
@Input() displayDialog = false
@Output() appChanged = new EventEmitter()
+ @ViewChild('panelDetail') panelDetail: TabView | undefined
public mfe: Microfrontend | undefined
public ms: Microservice | undefined
public formGroupMfe: FormGroup
public formGroupMs: FormGroup
- public dialogTitelKey = ''
+ public tabIndex = 0
+ public dialogTitleKey = ''
public loading = false
public operator = false
public undeployed = false
public deprecated = false
public hasCreatePermission = false
public hasEditPermission = false
- public technologies: SelectItem[] = [
- { label: 'Angular', value: 'ANGULAR' },
- { label: 'WebComponent', value: 'WEBCOMPONENTMODULE' }
- ]
+ public technologies: SelectItem[] = []
public types: SelectItem[] = [
{ label: 'Module', value: 'MODULE' },
{ label: 'Component', value: 'COMPONENT' }
@@ -86,7 +88,8 @@ export class AppDetailComponent implements OnChanges {
private msApi: MicroservicesAPIService,
private mfeApi: MicrofrontendsAPIService,
private msgService: PortalMessageService,
- private translate: TranslateService
+ private translate: TranslateService,
+ private renderer: Renderer2
) {
this.hasCreatePermission = this.user.hasPermission('APP#CREATE')
this.hasEditPermission = this.user.hasPermission('APP#EDIT')
@@ -104,6 +107,8 @@ export class AppDetailComponent implements OnChanges {
type: new FormControl(null),
remoteBaseUrl: new FormControl(null, [Validators.maxLength(255)]),
remoteEntry: new FormControl(null, [Validators.maxLength(255)]),
+ remoteName: new FormControl(null, [Validators.maxLength(255)]),
+ tagName: new FormControl(null, [Validators.maxLength(255)]),
exposedModule: new FormControl(null, [Validators.maxLength(255)]),
classifications: new FormControl(null, [Validators.maxLength(255)]),
contact: new FormControl(null, [Validators.maxLength(255)]),
@@ -119,6 +124,10 @@ export class AppDetailComponent implements OnChanges {
})
}
+ ngOnInit() {
+ this.getDropdownTranslations()
+ }
+
ngOnChanges() {
this.enableForms()
if (this.changeMode === 'CREATE') {
@@ -174,7 +183,7 @@ export class AppDetailComponent implements OnChanges {
}
this.enableForms()
}
- this.dialogTitelKey = 'ACTIONS.' + this.changeMode + '.MFE.HEADER'
+ this.dialogTitleKey = 'ACTIONS.' + this.changeMode + '.MFE.HEADER'
}
})
}
@@ -200,7 +209,7 @@ export class AppDetailComponent implements OnChanges {
}
this.enableForms()
}
- this.dialogTitelKey = 'ACTIONS.' + this.changeMode + '.MS.HEADER'
+ this.dialogTitleKey = 'ACTIONS.' + this.changeMode + '.MS.HEADER'
}
})
}
@@ -216,6 +225,8 @@ export class AppDetailComponent implements OnChanges {
type: mfe['type'],
remoteBaseUrl: mfe['remoteBaseUrl'],
remoteEntry: mfe['remoteEntry'],
+ remoteName: mfe['remoteName'],
+ tagName: mfe['tagName'],
exposedModule: mfe['exposedModule'],
classifications: mfe['classifications'],
contact: mfe['contact'],
@@ -258,6 +269,9 @@ export class AppDetailComponent implements OnChanges {
}
}
+ public onTabPanelChange(e: any): void {
+ this.tabIndex = e.index
+ }
private createMfe() {
this.mfeApi.createMicrofrontend({ createMicrofrontendRequest: this.mfe as CreateMicrofrontendRequest }).subscribe({
next: () => {
@@ -330,4 +344,14 @@ export class AppDetailComponent implements OnChanges {
})
console.error('err', err)
}
+
+ private getDropdownTranslations() {
+ this.translate.get(['APP.WEBCOMPONENT.MODULE', 'APP.WEBCOMPONENT.SCRIPT']).subscribe((data) => {
+ this.technologies = [
+ { label: 'Angular', value: 'ANGULAR' },
+ { label: data['APP.WEBCOMPONENT.MODULE'], value: 'WEBCOMPONENTMODULE' },
+ { label: data['APP.WEBCOMPONENT.SCRIPT'], value: 'WEBCOMPONENTSCRIPT' }
+ ]
+ })
+ }
}
diff --git a/src/app/product-store/app-detail/app-intern/app-intern.component.html b/src/app/product-store/app-detail/app-intern/app-intern.component.html
new file mode 100644
index 0000000..d5b2460
--- /dev/null
+++ b/src/app/product-store/app-detail/app-intern/app-intern.component.html
@@ -0,0 +1,125 @@
+
diff --git a/src/app/product-store/app-detail/app-intern/app-intern.component.scss b/src/app/product-store/app-detail/app-intern/app-intern.component.scss
new file mode 100644
index 0000000..949c7c0
--- /dev/null
+++ b/src/app/product-store/app-detail/app-intern/app-intern.component.scss
@@ -0,0 +1,39 @@
+@import '/src/_mixins.scss';
+
+@include danger-action;
+
+/* limit deletion dialog */
+:host ::ng-deep {
+ // popup dialogues
+ @media (max-width: 991px) {
+ .p-dialog.p-dialog {
+ max-height: unset !important;
+ height: unset !important;
+ }
+ }
+
+ .p-dialog {
+ background: var(--panel-content-bg);
+ .p-dialog-content {
+ border-radius: unset !important;
+ padding-bottom: 0.5rem;
+ margin-bottom: 0.5rem;
+ }
+ .p-dialog-footer button {
+ margin: unset;
+ }
+ .p-dialog-header .p-dialog-header-icons {
+ display: none;
+ }
+ }
+ .p-fieldset {
+ &.p-fieldset-toggleable .p-fieldset-legend a,
+ .p-fieldset-legend {
+ background-color: transparent;
+ padding: 0.3rem 0.4rem;
+ }
+ .p-fieldset-content {
+ padding: 1rem 0.2rem 0rem;
+ }
+ }
+}
diff --git a/src/app/product-store/app-detail/app-intern/app-intern.component.spec.ts b/src/app/product-store/app-detail/app-intern/app-intern.component.spec.ts
new file mode 100644
index 0000000..8b4d242
--- /dev/null
+++ b/src/app/product-store/app-detail/app-intern/app-intern.component.spec.ts
@@ -0,0 +1,93 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core'
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'
+import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { RouterTestingModule } from '@angular/router/testing'
+import { TranslateTestingModule } from 'ngx-translate-testing'
+
+import { AppInternComponent } from './app-intern.component'
+import { Microfrontend, Microservice } from 'src/app/shared/generated'
+
+const appMfe: Microfrontend = {
+ operator: true,
+ deprecated: false,
+ undeployed: true
+} as Microfrontend
+
+const appMs: Microservice = {
+ operator: true,
+ undeployed: true
+}
+
+describe('AppInternComponent', () => {
+ let component: AppInternComponent
+ let fixture: ComponentFixture
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [AppInternComponent],
+ imports: [
+ RouterTestingModule,
+ HttpClientTestingModule,
+ TranslateTestingModule.withTranslations({
+ de: require('src/assets/i18n/de.json'),
+ en: require('src/assets/i18n/en.json')
+ }).withDefaultLanguage('en')
+ ],
+ schemas: [NO_ERRORS_SCHEMA]
+ }).compileComponents()
+ }))
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AppInternComponent)
+ component = fixture.componentInstance
+ fixture.detectChanges()
+ })
+
+ it('should create', () => {
+ expect(component).toBeTruthy()
+ })
+
+ describe('ngOnChanges', () => {
+ it('should set relevant values correctly when viewed app is Microfrontend', () => {
+ component.app = appMfe
+
+ component.ngOnChanges()
+
+ expect(component.undeployed).toBe(true)
+ expect(component.operator).toBe(true)
+ expect(component.deprecated).toBe(false)
+ })
+
+ it('should set relevant values to false when viewed app is Microservice', () => {
+ component.app = appMs
+
+ component.ngOnChanges()
+
+ expect(component.undeployed).toBe(true)
+ expect(component.operator).toBe(true)
+ expect(component.deprecated).toBe(false)
+ })
+
+ it('should set all properties to false when app is undefined', () => {
+ component.app = undefined
+
+ component.ngOnChanges()
+
+ expect(component.undeployed).toBe(false)
+ expect(component.operator).toBe(false)
+ expect(component.deprecated).toBe(false)
+ })
+
+ it('should set deprecated to false if app is a Microfrontend and deprecated property is missing', () => {
+ const appMfeNoDeprecated: Partial = {
+ operator: true,
+ undeployed: true
+ }
+ component.app = appMfeNoDeprecated as Microfrontend
+
+ component.ngOnChanges()
+
+ expect(component.deprecated).toBe(false)
+ })
+ })
+})
diff --git a/src/app/product-store/app-detail/app-intern/app-intern.component.ts b/src/app/product-store/app-detail/app-intern/app-intern.component.ts
new file mode 100644
index 0000000..1766d3f
--- /dev/null
+++ b/src/app/product-store/app-detail/app-intern/app-intern.component.ts
@@ -0,0 +1,33 @@
+import { Component, Input, OnChanges } from '@angular/core'
+import { TranslateService } from '@ngx-translate/core'
+
+import { Microfrontend, Microservice } from 'src/app/shared/generated'
+
+@Component({
+ selector: 'app-app-intern',
+ templateUrl: './app-intern.component.html'
+})
+export class AppInternComponent implements OnChanges {
+ @Input() app: (Microfrontend | Microservice) | undefined
+ @Input() dateFormat = 'medium'
+
+ public undeployed = false
+ public operator = false
+ public deprecated = false
+
+ constructor(private translate: TranslateService) {}
+
+ public ngOnChanges(): void {
+ this.undeployed = this.app?.undeployed ?? false
+ this.operator = this.app?.operator ?? false
+ if (this.isMicrofrontend(this.app)) {
+ this.deprecated = this.app.deprecated ?? false
+ } else {
+ this.deprecated = false
+ }
+ }
+
+ private isMicrofrontend(app: Microfrontend | Microservice | undefined): app is Microfrontend {
+ return (app as Microfrontend)?.deprecated !== undefined
+ }
+}
diff --git a/src/app/product-store/app-search/app-search.component.html b/src/app/product-store/app-search/app-search.component.html
index 75fc9ea..cd90077 100644
--- a/src/app/product-store/app-search/app-search.component.html
+++ b/src/app/product-store/app-search/app-search.component.html
@@ -152,8 +152,9 @@
-
@@ -248,7 +249,7 @@
{{ limitText(app.productName, 25) }}
-
+