Feature: Experiment Archive State

backend/packages/Upgrade/src/api/controllers/QueryController.ts

@@ -50,40 +50,4 @@ export class QueryController {
   ): Promise<any> {
     return this.queryService.analyze(dataLogParams.queryIds, request.logger);
   }
-
-  /**
-   * @swagger
-   * /query/archive:
-   *    post:
-   *       description: Data log analysis
-   *       consumes:
-   *         - application/json
-   *       parameters:
-   *         - in: body
-   *           name: params
-   *           required: true
-   *           schema:
-   *             type: object
-   *             properties:
-   *               queryIds:
-   *                 type: array
-   *                 items:
-   *                  type: string
-   *           description: Data analysis
-   *       tags:
-   *         - Query
-   *       produces:
-   *         - application/json
-   *       responses:
-   *          '200':
-   *            description: Get data analysis
-   */
-  @Post('/archive')
-  public archive(
-    @Body()
-    dataLogParams: DataLogAnalysisValidator,
-    @Req() request: AppRequest
-  ): Promise<any> {
-    return this.queryService.getArchivedStats(dataLogParams.queryIds, request.logger);
-  }
 }

backend/packages/Upgrade/src/api/models/ArchivedStats.ts

@@ -10,7 +10,7 @@ export class ArchivedStats extends BaseModel {
 
   @IsNotEmpty()
   @Column('jsonb')
-  public result: any;
+  public result: object;
 
   @OneToOne(() => Query, (query) => query.archivedStats, { onDelete: 'CASCADE' })
   @JoinColumn()

backend/packages/Upgrade/src/api/services/QueryService.ts

@@ -3,7 +3,7 @@ import { OrmRepository } from 'typeorm-typedi-extensions';
 import { QueryRepository } from '../repositories/QueryRepository';
 import { Query } from '../models/Query';
 import { LogRepository } from '../repositories/LogRepository';
-import { EXPERIMENT_TYPE, SERVER_ERROR } from 'upgrade_types';
+import { EXPERIMENT_STATE, EXPERIMENT_TYPE, SERVER_ERROR } from 'upgrade_types';
 import { ErrorService } from './ErrorService';
 import { ExperimentError } from '../models/ExperimentError';
 import { UpgradeLogger } from '../../lib/logger/UpgradeLogger';
@@ -66,6 +66,12 @@ export class QueryService {
 
     const promiseResult = await Promise.all(promiseArray);
     const experiments: Experiment[] = [];
+
+    // checks for archieve state experiment
+    if (promiseResult[0].experiment?.state === EXPERIMENT_STATE.ARCHIVED) {
+      return await this.getArchivedStats(queryIds, logger);
+    }
+
     const analyzePromise = promiseResult.map((query) => {
       experiments.push(query.experiment);
       if (query.experiment?.type === EXPERIMENT_TYPE.FACTORIAL) {

frontend/projects/upgrade/src/app/core/analysis/analysis.data.service.ts

@@ -26,9 +26,4 @@ export class AnalysisDataService {
     const url = this.environment.api.queryResult;
     return this.http.post(url, { queryIds });
   }
-
-  archiveQuery(queryIds: string[]) {
-    const url = this.environment.api.archiveResult;
-    return this.http.post(url, { queryIds });
-  }
 }

frontend/projects/upgrade/src/app/core/analysis/analysis.service.ts

@@ -34,8 +34,8 @@ export class AnalysisService {
     this.store$.dispatch(AnalysisActions.actionDeleteMetric({ key }));
   }
 
-  executeQuery(queryIds: string[], state?: EXPERIMENT_STATE) {
-    this.store$.dispatch(AnalysisActions.actionExecuteQuery({ queryIds, state }));
+  executeQuery(queryIds: string[]) {
+    this.store$.dispatch(AnalysisActions.actionExecuteQuery({ queryIds }));
   }
 
   setQueryResult(queryResult: any) {

frontend/projects/upgrade/src/app/core/analysis/store/analysis.actions.ts

@@ -34,10 +34,7 @@ export const actionUpsertMetricsSuccess = createAction(
 
 export const actionUpsertMetricsFailure = createAction('[Analysis] Upsert Metrics Failure');
 
-export const actionExecuteQuery = createAction(
-  '[Analysis] Execute Query',
-  props<{ queryIds: string[]; state?: EXPERIMENT_STATE }>()
-);
+export const actionExecuteQuery = createAction('[Analysis] Execute Query', props<{ queryIds: string[] }>());
 
 export const actionExecuteQuerySuccess = createAction(
   '[Analysis] Execute Query Success',

frontend/projects/upgrade/src/app/core/analysis/store/analysis.effects.ts

@@ -6,7 +6,6 @@ import { AnalysisDataService } from '../analysis.data.service';
 import { Store, select } from '@ngrx/store';
 import { AppState } from '../../core.state';
 import { selectQueryResult } from './analysis.selectors';
-import { EXPERIMENT_STATE } from '../../experiments/store/experiments.model';
 
 @Injectable()
 export class AnalysisEffects {
@@ -67,15 +66,11 @@ export class AnalysisEffects {
   executeQuery$ = createEffect(() =>
     this.actions$.pipe(
       ofType(AnalysisActions.actionExecuteQuery),
-      map((action) => ({ queryIds: action.queryIds, state: action.state })),
-      filter(({ queryIds }) => !!queryIds.length),
+      map((action) => action.queryIds),
+      filter((queryIds) => !!queryIds.length),
       withLatestFrom(this.store$.pipe(select(selectQueryResult))),
-      switchMap(([{ queryIds, state }, queryResult]) => {
-        const analysisData =
-          (state && state === EXPERIMENT_STATE.ARCHIVED)
-            ? this.analysisDataService.archiveQuery(queryIds)
-            : this.analysisDataService.executeQuery(queryIds);
-        return analysisData.pipe(
+      switchMap(([queryIds, queryResult]) =>
+        this.analysisDataService.executeQuery(queryIds).pipe(
           map((data: any) => {
             let newResults = queryResult && queryResult.length ? queryResult : [];
             if (data.length) {
@@ -91,8 +86,8 @@ export class AnalysisEffects {
             return AnalysisActions.actionExecuteQuerySuccess({ queryResult: newResults });
           }),
           catchError(() => [AnalysisActions.actionExecuteQueryFailure()])
-        );
-      })
+        )
+      )
     )
   );
 }

frontend/projects/upgrade/src/app/core/analysis/store/analysis.selectors.ts

@@ -1,5 +1,5 @@
 import { createSelector, createFeatureSelector } from '@ngrx/store';
-import { AnalysisState, State } from './analysis.models';
+import { AnalysisState } from './analysis.models';
 
 export const selectAnalysisState = createFeatureSelector<AnalysisState>('analysis');
 

frontend/projects/upgrade/src/app/core/experiments/store/experiments.effects.ts

@@ -163,10 +163,7 @@ export class ExperimentEffects {
                   experimentAction.actionFetchExperimentStatsSuccess({ stats }),
                   experimentAction.actionUpsertExperimentSuccess({ experiment: data }),
                   experimentAction.actionFetchAllDecisionPoints(),
-                  analysisAction.actionExecuteQuery({
-                    queryIds,
-                    state: data.state,
-                  }),
+                  analysisAction.actionExecuteQuery({ queryIds }),
                 ];
               })
             )

frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-list/experiment-list.component.ts

@@ -56,7 +56,7 @@ export class ExperimentListComponent implements OnInit, OnDestroy, AfterViewInit
   searchControl = new FormControl();
 
   get filteredStatusOptions(): string[] {
-    if (this.searchValue !== undefined) {
+    if (typeof this.searchValue === 'string') {
       const filterValue = this.searchValue.toLowerCase();
       return this.statusFilterOptions.filter((option) => option.toLowerCase().includes(filterValue));
     } else {
@@ -144,7 +144,7 @@ export class ExperimentListComponent implements OnInit, OnDestroy, AfterViewInit
 
   applyFilter(filterValue: string) {
     this.filterExperimentPredicate(this.selectedExperimentFilterOption);
-    if (filterValue !== undefined) {
+    if (typeof filterValue === 'string') {
       if (this.selectedExperimentFilterOption === EXPERIMENT_SEARCH_KEY.STATUS) {
         this.allExperiments.filter = filterValue.trim().toLowerCase();
       } else {

frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-query-result/experiment-query-result.component.ts

@@ -77,7 +77,6 @@ export class ExperimentQueryResultComponent implements OnInit, OnDestroy {
   ngOnInit() {
     const queryIds = [];
     this.experimentType = this.experiment.type;
-    this.experimentState = this.experiment.state
 
     if (this.experimentType === EXPERIMENT_TYPE.FACTORIAL) {
       this.setMaxLevelsCount();
@@ -101,7 +100,7 @@ export class ExperimentQueryResultComponent implements OnInit, OnDestroy {
         [query.id]: [],
       };
     });
-    this.analysisService.executeQuery(queryIds, this.experimentState);
+    this.analysisService.executeQuery(queryIds);
     this.queryResultsSub = this.analysisService.queryResult$.pipe(filter((result) => !!result)).subscribe((result) => {
       // main effect graph data
       this.populateMainEffectGraphData(result);

frontend/projects/upgrade/src/assets/i18n/en.json

@@ -268,7 +268,7 @@
   "home.change-experiment-status.enrolling-info.text": "*Once the experiment is started you won’t be allowed to update Experiment’s Condition and Sites",
   "home.change-experiment-status.enrolling-error.text": "*Experiment start date should not be greater than experiment end date {{ endDate }}",
   "home.change-experiment-status.condition-count-error.text": "*Please have at least 2 conditions to move forward",
-  "home.change-experiment-status.archiving-confirmation.text": "Please acknowledge that you agree to permanently transition this experiment to archive status",
+  "home.change-experiment-status.archiving-confirmation.text": "Please acknowledge that you agree to permanently transition this experiment to archive status.",
   "home.change-experiment-status.archiving-info.text": "*Archiving the experiment will cancel the post rule. The archived experiments are hidden from the experiment list and can be found by explicitly searching for 'Archived' experiments.",
   "home.change-post-experiment-rule.title.text": "Change Post Experiment Condition",
   "logs-global.log-zero-state.text": "No Logs",

frontend/projects/upgrade/src/environments/environment-types.ts

@@ -33,7 +33,6 @@ export interface APIEndpoints {
   metrics: string;
   metricsSave: string;
   queryResult: string;
-  archiveResult: string;
   getVersion: string;
   contextMetaData: string;
   segments: string;

frontend/projects/upgrade/src/environments/environment.bsnl.ts

@@ -42,7 +42,6 @@ export const environment = {
     metrics: '/metric',
     metricsSave: '/metric/save',
     queryResult: '/query/analyse',
-    archiveResult: '/query/archive',
     getVersion: '/version',
     contextMetaData: '/experiments/contextMetaData',
     segments: '/segments',

frontend/projects/upgrade/src/environments/environment.demo.prod.ts

@@ -42,7 +42,6 @@ export const environment = {
     metrics: '/metric',
     metricsSave: '/metric/save',
     queryResult: '/query/analyse',
-    archiveResult: '/query/archive',
     getVersion: '/version',
     contextMetaData: '/experiments/contextMetaData',
     segments: '/segments',

frontend/projects/upgrade/src/environments/environment.prod.ts

@@ -42,7 +42,6 @@ export const environment = {
     metrics: '/metric',
     metricsSave: '/metric/save',
     queryResult: '/query/analyse',
-    archiveResult: '/query/archive',
     getVersion: '/version',
     contextMetaData: '/experiments/contextMetaData',
     segments: '/segments',

frontend/projects/upgrade/src/environments/environment.staging.ts

@@ -42,7 +42,6 @@ export const environment = {
     metrics: '/metric',
     metricsSave: '/metric/save',
     queryResult: '/query/analyse',
-    archiveResult: '/query/archive',
     getVersion: '/version',
     contextMetaData: '/experiments/contextMetaData',
     segments: '/segments',

frontend/projects/upgrade/src/environments/environment.ts

@@ -46,7 +46,6 @@ export const environment = {
     metrics: '/metric',
     metricsSave: '/metric/save',
     queryResult: '/query/analyse',
-    archiveResult: '/query/archive',
     getVersion: '/version',
     contextMetaData: '/experiments/contextMetaData',
     segments: '/segments',