Skip to content

Commit 97e8664

Browse files
committed
feature: TT-430 hide add new activity in production
1 parent a8db62d commit 97e8664

File tree

6 files changed

+40
-14
lines changed

6 files changed

+40
-14
lines changed

src/app/modules/activities-management/components/activity-list/activity-list.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
<tr class="d-flex">
55
<th class="col-2 text-center">Activity ID</th>
66
<th class="col-4 text-center">Activity</th>
7-
<th class="col-2 text-center">Status</th>
8-
<th class="col-2 text-center">Options</th>
9-
<th class="col-2 text-center">Status</th>
7+
<th class="{{showOptionInDevelopment ? 'col-2' : 'col-6'}} text-center">Status</th>
8+
<th class="col-2 text-center" *ngIf="showOptionInDevelopment">Options</th>
9+
<th class="col-2 text-center" *ngIf="showOptionInDevelopment">Status</th>
1010
</tr>
1111
</thead>
1212
<app-loading-bar *ngIf="isLoading$ | async"></app-loading-bar>
1313
<tbody *ngIf="(isLoading$ | async) === false">
1414
<tr class="d-flex" *ngFor="let activity of activities">
1515
<td class="col-2 text-break">{{ activity.id }}</td>
1616
<td class="col-4">{{ activity.name }}</td>
17-
<td class="col-2">{{ activity.status }}</td>
18-
<td class="col-2 text-center">
17+
<td class="{{showOptionInDevelopment ? 'col-2' : 'col-6'}} text-center">{{ activity.status }}</td>
18+
<td class="col-2 text-center" *ngIf="showOptionInDevelopment">
1919
<button type="button" class="btn btn-sm btn-primary" (click)="updateActivity(activity.id)">
2020
<i class="fa fa-pencil fa-xs"></i>
2121
</button>
2222
</td>
23-
<td class="col-2 text-center">
23+
<td class="col-2 text-center" *ngIf="showOptionInDevelopment">
2424
<app-dropdown [info]="activity" (updateInfo)="changeOperation($event)"> </app-dropdown>
2525
</td>
2626
</tr>

src/app/modules/activities-management/components/activity-list/activity-list.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
1+
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
22
import { select, Store } from '@ngrx/store';
33
import { Observable } from 'rxjs';
44
import { delay, map } from 'rxjs/operators';
@@ -16,6 +16,7 @@ import { ActivityState } from './../../store/activity-management.reducers';
1616
export class ActivityListComponent implements OnInit {
1717
@Output() changeValueShowActivityForm = new EventEmitter<boolean>();
1818
showActivityForm: boolean;
19+
@Input() showOptionInDevelopment: boolean;
1920

2021
constructor(private store: Store<ActivityState>) {
2122
this.isLoading$ = store.pipe(delay(0), select(getIsLoading));
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
<div class="col-12 col-md-9 px-0">
2-
<div class="hidden">
1+
<div class="col-12 px-0">
2+
<div *ngIf="showOptionInDevelopment">
33
<app-create-activity
4-
[showActivityForm]="showActivityForm" (changeValueShowActivityForm)="showActivityForm = $event"></app-create-activity>
4+
[showActivityForm]="showActivityForm"
5+
(changeValueShowActivityForm)="showActivityForm = $event"
6+
>
7+
</app-create-activity>
58
</div>
69
<app-activity-list
7-
(changeValueShowActivityForm)="showActivityForm = $event"></app-activity-list>
10+
[showOptionInDevelopment]="showOptionInDevelopment"
11+
(changeValueShowActivityForm)="showActivityForm = $event"
12+
>
13+
</app-activity-list>
814
</div>

src/app/modules/activities-management/pages/activities-management.component.spec.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { waitForAsync, TestBed, ComponentFixture } from '@angular/core/testing';
2+
import { by, By, element } from 'protractor';
23
import { ActivitiesManagementComponent } from './activities-management.component';
34

45
describe('ActivitiesManagementComponent', () => {
@@ -21,4 +22,8 @@ describe('ActivitiesManagementComponent', () => {
2122
it('should create the component', () => {
2223
expect(component).toBeTruthy();
2324
});
25+
26+
it('should check if is in development environment', () => {
27+
expect(component.showOptionInDevelopment).toBe(true)
28+
})
2429
});
Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1-
import { Component, Input } from '@angular/core';
1+
import { Component, Input, OnInit } from '@angular/core';
2+
import { environment } from 'src/environments/environment'
3+
24
@Component({
35
selector: 'app-activities-management',
46
templateUrl: './activities-management.component.html',
57
styleUrls: ['./activities-management.component.scss'],
68
})
7-
export class ActivitiesManagementComponent {
9+
export class ActivitiesManagementComponent implements OnInit {
810
@Input() showActivityForm: boolean;
11+
showOptionInDevelopment: boolean = true;
12+
13+
ngOnInit() {
14+
this.showOption()
15+
}
16+
17+
showOption(): void {
18+
if(environment.production){
19+
this.showOptionInDevelopment = false
20+
}
21+
}
922
}

src/app/modules/activities-management/store/activity-management.effects.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ export class ActivityEffects {
9696
ofType(actions.ActivityManagementActionTypes.UNARCHIVE_ACTIVITY),
9797
map((action: actions.UnarchiveActivity) => ({
9898
id: action.payload,
99-
status: 'active'
99+
status: 'active',
100+
deleted: false
100101
})
101102
),
102103
mergeMap((activity: ActivityStatus) =>

0 commit comments

Comments
 (0)