Skip to content

Commit

Permalink
deleted unused custom formly fields
Browse files Browse the repository at this point in the history
  • Loading branch information
ck-c8y committed Feb 12, 2024
1 parent 50c10b3 commit 7e2d183
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 396 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@
#

# properties used for local testing
APP.additionalSubscriptionIdTest=
APP.additionalSubscriptionIdTest=herz
# C8Y.bootstrap.user=servicebootstrap_mqtt-mapping-service
# C8Y.bootstrap.password=<BOOTSTRAP_PASSWORD>
# C8Y.bootstrap.tenant=<TENANT_ID>
# C8Y.baseURL=<TENANT_URL>
# C8Y.baseURL=<TENANT_URL>
C8Y.bootstrap.user=servicebootstrap_dynamic-mapping-service
C8Y.bootstrap.password=KPViCgfRXWSr02nRy903L62C1jkoExMl
C8Y.bootstrap.tenant=t14070519
C8Y.baseURL=https://sag-dach.eu-latest.cumulocity.com
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# @authors Christof Strack, Stefan Witschel
#

spring.profiles.active=prod
spring.profiles.active=dev
application.name=dynamic-mapping-service
server.port=8080
server.error.include-message=always
Expand Down
22 changes: 4 additions & 18 deletions dynamic-mapping-ui/src/dynamic-mapping.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,12 @@ import {
checkTopicsInboundAreValid,
checkTopicsOutboundAreValid
} from './mapping/shared/util';
import { SelectComponent } from './mapping/shared/formly/select/select.type.component';
import { FieldCheckbox } from './mapping/shared/formly/checkbox/checkbox.type.component';
import { FormlyFieldButton } from './mapping/shared/formly/button.type.component';
import { C8YSwitchField } from './mapping/shared/formly/c8y-switch.type.component';
import { FormlyFiller } from './mapping/shared/formly/filler.type.component';
import { WrapperCustomFormField } from './mapping/shared/formly/form-field/custom-form.type.component';
import { FormlyHorizontalWrapper } from './mapping/shared/formly/horizontal-wrapper.type.component';
import { WrapperFormlyHorizontal } from './mapping/shared/formly/horizontal.wrapper.component';
import { FieldInputCustom } from './mapping/shared/formly/input-custom.type.component';
import { MessageField } from './mapping/shared/formly/message.type.component';
import { FormlyTextField } from './mapping/shared/formly/text.type.component';
import { FieldTextareaCustom } from './mapping/shared/formly/textarea.type.component';
import { WrapperCustomFormField } from './mapping/shared/formly/custom-form-field.wrapper.component';

@NgModule({
imports: [
Expand Down Expand Up @@ -101,24 +96,15 @@ import { FieldTextareaCustom } from './mapping/shared/formly/textarea.type.compo
],
types: [
{ name: 'text', component: FormlyTextField },
{ name: 'filler', component: FormlyFiller },
{ name: 'textarea-custom', component: FieldTextareaCustom },
{ name: 'input-custom', component: FieldInputCustom },
{ name: 'button', component: FormlyFieldButton },
{ name: 'message-field', component: MessageField },
{ name: 'c8y-switch', component: C8YSwitchField },
{
name: 'select',
component: SelectComponent,
wrappers: ['c8y-form-field']
},
{ name: 'enum', extends: 'select' },
{ name: 'checkbox', component: FieldCheckbox },
{ name: 'boolean', extends: 'checkbox' }
],
wrappers: [
{ name: 'form-field-horizontal', component: FormlyHorizontalWrapper },
{ name: 'custom-form-field', component: WrapperCustomFormField }
{ name: 'form-field-horizontal', component: WrapperFormlyHorizontal },
{ name: 'custom-form-field', component: WrapperCustomFormField },
]
}
}
Expand Down
12 changes: 3 additions & 9 deletions dynamic-mapping-ui/src/mapping/mapping.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,16 @@ import { SnoopedTemplateRendererComponent } from './renderer/snoopedTemplate.ren
import { StatusActivationRendererComponent } from './renderer/status-activation-renderer.component';
import { StatusRendererComponent } from './renderer/status-cell.renderer.component';
import { TemplateRendererComponent } from './renderer/template.renderer.component';
import { C8YSwitchField } from './shared/formly/c8y-switch.type.component';
import { FieldCheckbox } from './shared/formly/checkbox/checkbox.type.component';
import { WrapperCustomFormField } from './shared/formly/form-field/custom-form.type.component';
import { FormlyHorizontalWrapper } from './shared/formly/horizontal-wrapper.type.component';
import { WrapperFormlyHorizontal } from './shared/formly/horizontal.wrapper.component';
import { FieldInputCustom } from './shared/formly/input-custom.type.component';
import { MessageField } from './shared/formly/message.type.component';
import { SelectComponent } from './shared/formly/select/select.type.component';
import { SnoopingModalComponent } from './snooping/snooping-modal.component';
import { MappingStepperComponent } from './step-main/mapping-stepper.component';
import { SubstitutionRendererComponent } from './step-main/substitution/substitution-renderer.component';
import { MappingStepPropertiesComponent } from './step-one/mapping-properties.component';
import { MappingStepTestingComponent } from './step-three/mapping-testing.component';
import { MappingSubscriptionComponent } from './subscription/mapping-subscription.component';
import { WrapperCustomFormField } from './shared/formly/custom-form-field.wrapper.component';

@NgModule({
declarations: [
Expand All @@ -76,11 +73,8 @@ import { MappingSubscriptionComponent } from './subscription/mapping-subscriptio
SnoopingModalComponent,
MappingTypeComponent,
MessageField,
FormlyHorizontalWrapper,
WrapperFormlyHorizontal,
WrapperCustomFormField,
C8YSwitchField,
SelectComponent,
FieldCheckbox,
FieldInputCustom
],
imports: [
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { FieldWrapper } from '@ngx-formly/core';

@Component({
selector: 'd11r-wrapper-form-field',
templateUrl: './custom-form.type.component.html'
templateUrl: './custom-form-field.wrapper.component.html'
// changeDetection: ChangeDetectionStrategy.OnPush
})
export class WrapperCustomFormField extends FieldWrapper implements OnInit {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ import { FieldWrapper } from '@ngx-formly/core';
</div>
`
})
export class FormlyHorizontalWrapper extends FieldWrapper {}
export class WrapperFormlyHorizontal extends FieldWrapper {}

This file was deleted.

Loading

0 comments on commit 7e2d183

Please sign in to comment.