Revert "EUI-2275: Invoke CCD Case Activity tracking (#656)" (#715)

* Revert "EUI-2275: Invoke CCD Case Activity tracking (#656)" This reverts commit 604c3b0. * changed casetype * iac casetype * FR tests ignored because of orgId UI change from FR: Co-authored-by: Daniel Lam (A533913) <[email protected]> Co-authored-by: VAMSHI MUNIGANTI <[email protected]>
hmcts · Nov 13, 2020 · 7b34526 · 7b34526
1 parent 3eaff6d
commit 7b34526
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 95 deletions.
diff --git a/api/application.ts b/api/application.ts
@@ -72,7 +72,6 @@ app.use('/api/markups', markupRouter)
 app.use('/api/redaction', redactionRouter)
 
 // TODO: move these to proxy routes as well
-app.use('/activity', routes)
 app.use('/aggregated', routes)
 app.use('/data', routes)
 

diff --git a/proxy.config.json b/proxy.config.json
@@ -44,11 +44,6 @@
     "secure": false,
     "logLevel": "debug"
   },
-  "/activity/*": {
-    "target": "http://localhost:3001",
-    "secure": false,
-    "logLevel": "debug"
-  },
   "/health": {
     "target": "http://localhost:3001",
     "secure": false,

diff --git a/src/assets/config/config.json b/src/assets/config/config.json
@@ -17,7 +17,7 @@
     "activity_batch_collection_delay_ms": 1,
     "activity_next_poll_request_ms": 5000,
     "activity_retry": 5,
-    "activity_url": "/activity",
+    "activity_url": "",
     "activity_max_request_per_batch": 25,
     "print_service_url": "/print",
     "remote_print_service_url": "https://return-case-doc-ccd.nonprod.platform.hmcts.net",

diff --git a/src/cases/case-feature.routes.ts b/src/cases/case-feature.routes.ts
@@ -1,23 +1,21 @@
-import { ModuleWithProviders } from '@angular/core';
-// routes
-import { RouterModule, Routes } from '@angular/router';
-import { CaseResolver, editorRouting, viewerRouting as caseViewRouting } from '@hmcts/ccd-case-ui-toolkit';
-import { HealthCheckGuard } from '../app/shared/guards/health-check.guard';
-import { CaseCreateSubmitComponent, CasesCreateComponent } from './containers';
 import { CaseDetailsHomeComponent } from './containers/case-details-home/case-details-home';
-import { CaseFilterComponent } from './containers/case-filter/case-filter.component';
 import { CaseHomeComponent } from './containers/case-home/case-home.component';
+// routes
+import { RouterModule, Routes } from '@angular/router';
+import { ModuleWithProviders } from '@angular/core';
 import { CaseListComponent } from './containers/case-list/case-list.component';
+import { CaseFilterComponent } from './containers/case-filter/case-filter.component';
+
 import { CaseSearchComponent } from './containers/case-search/case-search.component';
-import { ActivityResolver } from './resolvers/activity.resolver';
+import {CasesCreateComponent, CaseCreateSubmitComponent } from './containers';
+import {viewerRouting as caseViewRouting, editorRouting, CaseResolver} from '@hmcts/ccd-case-ui-toolkit';
+import {CaseDetailsComponent} from './containers/case-details/case-details.component';
+import { HealthCheckGuard } from 'src/app/shared/guards/health-check.guard';
 import { CreateCaseEventTriggerResolver } from './resolvers/create-case-event-trigger.resolver';
 
 export const ROUTES: Routes = [
     {
       path: '',
-      resolve: {
-        activity: ActivityResolver,
-      },
       component: CaseHomeComponent,
       children: [
         {

diff --git a/src/cases/cases.module.ts b/src/cases/cases.module.ts
@@ -1,46 +1,46 @@
+import { NgModule, Optional, SkipSelf, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { AppConfig } from '../app/services/ccd-config/ccd-case.config';
+import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
 import { HttpClientModule } from '@angular/common/http';
-import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
-import { HttpModule } from '@angular/http';
 import { MatDialogModule } from '@angular/material';
-import { AppConfig } from '../app/services/ccd-config/ccd-case.config';
 
 import {
-    AbstractAppConfig,
-    AlertService,
-    AuthService as CCDAuthService,
-    CaseEditWizardGuard,
-    CaseListFiltersModule,
-    CasesService,
     CaseUIToolkitModule,
-    CreateCaseFiltersModule,
-    DocumentManagementService,
     DraftService,
-    HttpErrorService,
     HttpService,
+    AuthService as CCDAuthService,
+    CasesService,
+    HttpErrorService,
+    AbstractAppConfig,
+    CaseEditWizardGuard,
+    RouterHelperService,
+    DocumentManagementService,
     PageValidationService,
     PlaceholderService,
     RequestOptionsBuilder,
-    RouterHelperService,
     SearchFiltersModule,
     SearchResultModule,
+    CreateCaseFiltersModule,
+    CaseListFiltersModule,
+    AlertService,
     WorkbasketFiltersModule,
 } from '@hmcts/ccd-case-ui-toolkit';
 
-import { EffectsModule } from '@ngrx/effects';
-import { StoreModule } from '@ngrx/store';
-import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { SharedModule } from '../app/shared/shared.module';
 import { casesRouting } from './case-feature.routes';
-// from components
-import * as fromComponents from './components';
+import {StoreModule} from '@ngrx/store';
+import {EffectsModule} from '@ngrx/effects';
+import {reducers, effects} from './store';
+import {SharedModule} from '../app/shared/shared.module';
+import {HttpModule} from '@angular/http';
 // from containers
 import * as fromContainers from './containers';
-import { ActivityResolver } from './resolvers/activity.resolver';
-import { CreateCaseEventTriggerResolver } from './resolvers/create-case-event-trigger.resolver';
+// from components
+import * as fromComponents from './components';
 // from services
 import * as fromServices from './services';
-import { effects, reducers } from './store';
+import {ProvidersModule} from '../app/providers/providers.module';
+import { CreateCaseEventTriggerResolver } from './resolvers/create-case-event-trigger.resolver';
 
 @NgModule({
     imports: [
@@ -78,8 +78,7 @@ import { effects, reducers } from './store';
     },
     ScrollToService,
     ...fromServices.services,
-    CreateCaseEventTriggerResolver,
-    ActivityResolver
+    CreateCaseEventTriggerResolver
   ]
 })
 /**
@@ -90,7 +89,7 @@ export class CasesModule {
     CasesModule.forRoot();
   }
 
-  public static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders {
     return {
       ngModule: CasesModule,
       providers: [

diff --git a/src/cases/resolvers/activity.resolver.spec.ts b/src/cases/resolvers/activity.resolver.spec.ts
diff --git a/src/cases/resolvers/activity.resolver.ts b/src/cases/resolvers/activity.resolver.ts
diff --git a/test/e2e/features/app/FRCreateCase_CaseWorker.feature b/test/e2e/features/app/FRCreateCase_CaseWorker.feature
@@ -1,4 +1,3 @@
-@fr @fullfunctional
 Feature: FR create case workflow - Case Worker
 
     Background:
@@ -8,7 +7,7 @@ Feature: FR create case workflow - Case Worker
         When I click on create case button
         Then Create case page should be displayed
 
-    @all
+    @all @fullfunctional
    Scenario Outline: Start FR Case Creation
         When I start case with jurisdiction "<Jurisdiction>" case type "<CaseType>" and event "<Event>"
         Then I am on case form page
@@ -17,7 +16,6 @@ Feature: FR create case workflow - Case Worker
     | Family Divorce | Financial Remedy Consented | Consent Order Application |
     | Family Divorce | Contested Financial Remedy | Form A Application |
 
-
     Scenario Outline:  Create and Submit FR Casese
         When I start case with jurisdiction "<Jurisdiction>" case type "<CaseType>" and event "<Event>"
         When I create FR case

diff --git a/test/e2e/features/app/FRCreateCase_solicitor.feature b/test/e2e/features/app/FRCreateCase_solicitor.feature
@@ -1,4 +1,3 @@
-@fr @fullfunctional
 Feature: FR create case workflow
 
   Background:
@@ -8,6 +7,7 @@ Feature: FR create case workflow
     When I click on create case button
     Then Create case page should be displayed
 
+  @fullfunctional
   Scenario Outline:  Start FR Case creation
     When I start case with jurisdiction "<Jurisdiction>" case type "<CaseType>" and event "<Event>"
     Then I am on case form page
@@ -16,7 +16,7 @@ Feature: FR create case workflow
       | Family Divorce | Financial Remedy Consented | Consent Order Application |
       | Family Divorce | Contested Financial Remedy | Form A Application        |
 
-
+  @fullfunctional
   Scenario Outline:  Cancel FR Case creation
     When I start case with jurisdiction "<Jurisdiction>" case type "<CaseType>" and event "<Event>"
     When I click cancel link
@@ -30,9 +30,9 @@ Feature: FR create case workflow
   Scenario Outline:  Create and Submit FR Case
     When I start case with jurisdiction "<Jurisdiction>" case type "<CaseType>" and event "<Event>"
     When I create FR case
-    Then I am on check your answers page 
+    Then I am on check your answers page
     When I submit case
-    Then I see case details page 
+    Then I see case details page
     Examples:
       | Jurisdiction   | CaseType                   | Event                     |
       | Family Divorce | Financial Remedy Consented | Consent Order Application |