Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

METRON-2139: Refactoring sensor-parser-config.component and wire NgRx #1430

Closed
wants to merge 16 commits into from
Closed

METRON-2139: Refactoring sensor-parser-config.component and wire NgRx #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cc78444
METRON-2114 Moving components to sensor parser module
tiborm May 17, 2019
5617507
METRON-2116 Removing redundant AppConfigService
tiborm May 17, 2019
685e361
METRON-2117 Aligning models to grouping feature
tiborm May 17, 2019
5641291
METRON-2115 Aligning UI to the parser aggregation API
tiborm May 17, 2019
7d380cc
METRON-2122 Fixing early app config access issue
tiborm May 20, 2019
0067a5e
METRON-2124 Move status information and start/stop to the Aggregate l…
sardell May 21, 2019
8adc022
METRON-2125 Making changes visible in the parser list by marking chan…
sardell May 21, 2019
f476ae0
METRON-2131 Add NgRx and related dependencies
ruffle1986 May 22, 2019
23727aa
METRON-2133 Add NgRx effects to communicate with the server
ruffle1986 May 22, 2019
fce54f5
METRON-2134 Add NgRx reducers to perform parser and group changes in …
ruffle1986 May 22, 2019
428287e
METRON-2135 Add NgRx actions to trigger state changes
ruffle1986 May 22, 2019
7d4ec86
METRON-2136 Add parser aggregation sidebar
ruffle1986 May 22, 2019
27a3574
METRON-2137 Implement drag and drop mechanism and wire NgRx
ruffle1986 May 22, 2019
7a665a6
METRON-2138 Code clean up
ruffle1986 May 22, 2019
2215b04
METRON-2139 Refactoring sensor-parser-config.component and wire NgRx
ruffle1986 May 22, 2019
c670ae0
Merge branch 'feature/METRON-1856-parser-aggregation' into METRON-2139
ruffle1986 Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 0 additions & 23 deletions metron-interface/metron-config/src/app/sensors/effects/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...rc/app/sensors/sensor-parser-config-readonly/sensor-parser-config-readonly.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<div *ngIf="item.model == 'kafkaTopic'" class="col-sm-6 px-0 float-left form-value">{{ kafkaTopic[item.value] ? kafkaTopic[item.value] : "-" }}</div>
<div *ngIf="item.model == 'topologyStatus'" class="col-sm-6 px-0 float-left form-value">{{ getTopologyStatus(item.value) }}</div>

<div *ngIf="item.model == 'grokStatement' && sensorParserConfigHistory.config.parserClassName === 'org.apache.metron.parsers.GrokParser'" style="border: none">
<div *ngIf="item.model == 'grokStatement' && sensorParserConfig.parserClassName === 'org.apache.metron.parsers.GrokParser'" style="border: none">
<div class="col-sm-12 form-sub-title">Grok Statement</div>
<div id="collapseGrok" class="col-sm-12 float-left form-value panel-collapse collapse"></div>
<div class="col-sm-12 float-left form-value grok" [innerHtml]="grokStatement"></div>
Expand Down
4 changes: 2 additions & 2 deletions ...ce/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
the specific language governing permissions and limitations under the License.
-->
<metron-config-metron-modal>
<metron-config-metron-modal *ngIf="sensorParserConfig">
<metron-config-sensor-grok [hidden]="!showGrokValidator" [showGrok]="showGrokValidator"
[grokStatement]="grokStatement"
[(patternLabel)]="patternLabel"
Expand Down Expand Up @@ -44,7 +44,7 @@
<div class="form-title">{{sensorName}} </div>
<i class="fa fa-times float-right main close-button" aria-hidden="true" (click)="goBack()"></i>

<form role="form" [formGroup]="sensorConfigForm">
<form *ngIf="sensorConfigForm" role="form" [formGroup]="sensorConfigForm">
<div class="form-group">
<label attr.for="sensorName">NAME * </label>
<input type="text" class="form-control" name="sensorName" formControlName="sensorName" [(ngModel)]="sensorName" (ngModelChange)="onSetSensorName()" [readonly]="editMode">
Expand Down