Skip to content

Commit 5adfbc5

Browse files
committed
refactor(rule-view): move and rename rule-view component files
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent 5e2ec15 commit 5adfbc5

5 files changed

Lines changed: 33 additions & 8 deletions

File tree

frontend/src/app/rule-management/app-rule/components/rule-list/rule-list.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {FilterService} from '../../../services/filter.service';
1818
import {RuleService} from '../../../services/rule.service';
1919
import {AddRuleComponent} from '../add-rule/add-rule.component';
2020
import {ImportRuleComponent} from '../import-rules/import-rule.component';
21-
import {RuleViewComponent} from '../see-rule/rule-view.component';
21+
import {RuleViewComponent} from '../rule-view/rule-view.component';
2222

2323

2424
@Component({

frontend/src/app/rule-management/app-rule/components/see-rule/rule-view.component.html renamed to frontend/src/app/rule-management/app-rule/components/rule-view/rule-view.component.html

File renamed without changes.

frontend/src/app/rule-management/app-rule/components/see-rule/rule-view.component.scss renamed to frontend/src/app/rule-management/app-rule/components/rule-view/rule-view.component.scss

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ app-utm-modal-header {
33
top: 0;
44
z-index: 10;
55
}
6-
.rule-view-container {
7-
max-height: 650px;
8-
}
96
.copy-btn {
107
border: none;
118
background: transparent;
@@ -91,7 +88,7 @@ app-utm-modal-header {
9188
border: 1px solid #d9d9d9;
9289
border-radius: 4px;
9390
overflow: hidden;
94-
height: 600px;
91+
height: 650px;
9592
width: 100%;
9693
flex: 1;
9794

@@ -108,11 +105,32 @@ app-utm-modal-header {
108105
.overflow-guard {
109106
width: 100% !important;
110107
height: 100% !important;
108+
overflow: hidden !important;
111109
}
112110

113111
.monaco-scrollable-element {
114112
width: 100% !important;
115113
height: 100% !important;
114+
overflow-y: auto !important;
115+
overflow-x: hidden !important;
116+
}
117+
118+
.monaco-scrollable-element.vertical {
119+
overflow-y: auto !important;
120+
}
121+
122+
123+
.scrollbar {
124+
&.vertical {
125+
.slider {
126+
background: rgba(0, 0, 0, 0.2) !important;
127+
border-radius: 4px !important;
128+
129+
&:hover {
130+
background: rgba(0, 0, 0, 0.4) !important;
131+
}
132+
}
133+
}
116134
}
117135

118136
.monaco-editor.readonly {

frontend/src/app/rule-management/app-rule/components/see-rule/rule-view.component.ts renamed to frontend/src/app/rule-management/app-rule/components/rule-view/rule-view.component.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, Input, OnInit} from '@angular/core';
1+
import {Component, Input} from '@angular/core';
22
import * as yaml from 'js-yaml';
33
import {mapRuleToYaml} from '../../../../shared/components/utm/util/utm-file-upload/shared/rule-yaml.mapper';
44
import {Rule} from '../../../models/rule.model';
@@ -27,7 +27,14 @@ export class RuleViewComponent {
2727
formatOnType: true,
2828
tabSize: 2,
2929
insertSpaces: true,
30-
readOnly: true
30+
readOnly: true,
31+
scrollbar: {
32+
vertical: 'auto',
33+
horizontal: 'hidden',
34+
useShadows: true,
35+
verticalSliderSize: 12,
36+
horizontalSliderSize: 0
37+
}
3138
};
3239

3340
get yamlString(): string {

frontend/src/app/rule-management/rule-management.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {AddReferenceComponent} from './app-rule/components/reference/add-referen
3737
import {RuleGenericFilterComponent} from './app-rule/components/rule-generic-filter/rule-generic-filter.component';
3838
import {RuleFieldComponent} from './app-rule/components/rule-list/components/rule-field/rule-field.component';
3939
import {RuleListComponent} from './app-rule/components/rule-list/rule-list.component';
40-
import {RuleViewComponent} from './app-rule/components/see-rule/rule-view.component'
40+
import {RuleViewComponent} from './app-rule/components/rule-view/rule-view.component'
4141
import {RuleManagementRoutingModule} from './rule-management.routing.module';
4242
import { DataTypeService } from './services/data-type.service';
4343
import {FilterService} from './services/filter.service';

0 commit comments

Comments
 (0)