Skip to content

Commit 52d84db

Browse files
authored
Fixed Chef Automate UI not responding when clicking on "+" symbol to show test results (#8673)
* added changes to fix the + icons on reports details page Signed-off-by: vinay sharma <[email protected]> * updated module name Signed-off-by: vinay sharma <[email protected]> --------- Signed-off-by: vinay sharma <[email protected]>
1 parent e945c76 commit 52d84db

File tree

9 files changed

+17
-16
lines changed

9 files changed

+17
-16
lines changed

components/automate-ui/src/app/app.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { ChefComponentsModule } from './components/chef-components.module';
3232
import { ChefPipesModule } from './pipes/chef-pipes.module';
3333
import { ComplianceModule } from './pages/+compliance/compliance.module';
3434
import { ComplianceSharedModule } from './pages/+compliance/shared/shared.module';
35-
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
35+
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
3636
import { IntegrationsModule } from './pages/integrations/integrations.module';
3737
import { PolicyModule } from './modules/policy/policy.module';
3838
import { ProjectModule } from './pages/project/project.module';
@@ -300,7 +300,7 @@ import { MfeSessionService } from './services/mfe-session/mfe-session.service';
300300
CookieModule.withOptions(),
301301
FormsModule,
302302
HttpClientModule,
303-
InfiniteScrollModule,
303+
InfiniteScrollDirective,
304304
InfraProxyModule,
305305
IntegrationsModule,
306306
NgrxEffectsModule,

components/automate-ui/src/app/page-components/selectbox/selectbox.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { ngrxReducers, NgrxStateAtom, runtimeChecks } from 'app/ngrx.reducers';
99
import { EventEmitter } from '@angular/core';
1010
// import { By } from '@angular/platform-browser';
1111
import { MockComponent } from 'ng2-mock-component';
12-
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
12+
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
1313

1414

1515
describe('SelectboxComponent', () => {
@@ -33,7 +33,7 @@ describe('SelectboxComponent', () => {
3333
FormsModule,
3434
ReactiveFormsModule,
3535
RouterTestingModule,
36-
InfiniteScrollModule,
36+
InfiniteScrollDirective,
3737
StoreModule.forRoot(ngrxReducers, { runtimeChecks })
3838
],
3939
schemas: []

components/automate-ui/src/app/pages/+compliance/+node-credentials/node-credentials-list/node-credential-list.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { FeatureFlagsService } from 'app/services/feature-flags/feature-flags.se
1010
import { FormBuilder } from '@angular/forms';
1111
import { NodeCredential, NodeCredentialTypes } from 'app/entities/node-credentials/node-credential.model';
1212
import { MatOptionSelectionChange } from '@angular/material/core';
13-
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
13+
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
1414
import { RouterTestingModule } from '@angular/router/testing';
1515
import { TelemetryService } from 'app/services/telemetry/telemetry.service';
1616

@@ -65,7 +65,7 @@ describe('NodeCredentialListComponent', () => {
6565
],
6666
imports: [
6767
ChefPipesModule,
68-
InfiniteScrollModule,
68+
InfiniteScrollDirective,
6969
RouterTestingModule,
7070
StoreModule.forRoot(ngrxReducers, { initialState: defaultInitialState, runtimeChecks })
7171
]

components/automate-ui/src/app/pages/+compliance/+node-credentials/node-credentials.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
import { NodeCredentialDetailsScreenComponent } from './node-credential-details/node-credential-details.component';
1616
import { CreateNodeCredentialModalComponent } from './create-node-credential-modal/create-node-credential-modal.component';
1717
import { SaveNodeCredential } from '../../../entities/node-credentials/node-credential.model';
18-
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
18+
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
1919
@NgModule({
2020
imports: [
2121
CommonModule,
@@ -25,7 +25,7 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
2525
FormsModule,
2626
ReactiveFormsModule,
2727
RouterModule,
28-
InfiniteScrollModule
28+
InfiniteScrollDirective
2929
],
3030
declarations: [
3131
NodeCredentialListComponent,

components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-node/reporting-node.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,12 @@ <h2 class="metadata-group-heading">Metadata</h2>
247247
</chef-icon>
248248
<p>{{ result.code_desc }}</p>
249249
</div>
250-
<div class="result-item-body" *ngIf="result.message.length || result.skip_message.length">
250+
<div class="result-item-body" *ngIf="result.message?.length || result.skip_message?.length">
251251
<chef-snippet [code]="result.message + result.skip_message"></chef-snippet>
252252
</div>
253253
</div>
254254
<!-- display message when there are no results -->
255-
<div class="result-item" *ngIf="control.result.length === 0">
255+
<div class="result-item" *ngIf="control.result?.length === 0">
256256
<div class="result-item-header">
257257
<p>No tests were executed</p>
258258
</div>

components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-node/reporting-node.component.scss

+1
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ dl.waiver-details {
618618
.wrapper {
619619
height: 100vh;
620620
width: 100%;
621+
overflow-y: scroll;
621622
}
622623

623624
::ng-deep .wrapper::-webkit-scrollbar {

components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-node/reporting-node.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ReportingNodeComponent } from './reporting-node.component';
77
import { ReportingNodeRoutingModule } from './reporting-node.routing';
88
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
99
import { ChefPipesModule } from '../../../../pipes/chef-pipes.module';
10-
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
10+
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
1111

1212
@NgModule({
1313
imports: [
@@ -17,7 +17,7 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
1717
ComplianceSharedModule,
1818
ChefComponentsModule,
1919
ChefPipesModule,
20-
InfiniteScrollModule
20+
InfiniteScrollDirective
2121
],
2222
declarations: [
2323
ReportingNodeComponent

components/automate-ui/src/app/pages/+compliance/+reporting/reporting.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ReportingSearchbarComponent } from './reporting-searchbar/reporting-sea
88
import { ReportingRoutingModule } from './reporting.routing';
99
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
1010
import { ChefPipesModule } from '../../../pipes/chef-pipes.module';
11-
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
11+
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
1212

1313
@NgModule({
1414
imports: [
@@ -18,7 +18,7 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
1818
ChefComponentsModule,
1919
ChefPipesModule,
2020
ReportingRoutingModule,
21-
InfiniteScrollModule
21+
InfiniteScrollDirective
2222
],
2323
declarations: [
2424
ReportingComponent,

components/automate-ui/src/app/pages/+compliance/+scanner/scanner.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { NodesEditComponent } from './containers/nodes-edit/nodes-edit.component
1616
import { AccordionComponent } from '../../../page-components/accordion/accordion.component';
1717
import { AccordionItemComponent } from '../../../page-components/accordion/accordion-item/accordion-item.component';
1818
import { SelectboxComponent } from '../../../page-components/selectbox/selectbox.component';
19-
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
19+
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
2020

2121
@NgModule({
2222
imports: [
@@ -26,7 +26,7 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
2626
ReactiveFormsModule,
2727
RouterModule,
2828
ScannerRoutingModule,
29-
InfiniteScrollModule
29+
InfiniteScrollDirective
3030
],
3131
providers: [
3232
ChefStatusIconPipe,

0 commit comments

Comments
 (0)