@@ -6,13 +6,11 @@ import React from 'react';
66import { Metrics , MetricsContract } from 'src/libs/ajax/Metrics' ;
77import { SamResources , SamResourcesContract } from 'src/libs/ajax/SamResources' ;
88import {
9- ImprovedDataTablesSetting ,
109 SeparateSubmissionFinalOutputsSetting ,
1110 WorkspaceAnalysisLogRetentionSetting ,
1211} from 'src/libs/ajax/workspaces/workspace-models' ;
1312import { Workspaces , WorkspacesAjaxContract , WorkspaceV2Contract } from 'src/libs/ajax/workspaces/Workspaces' ;
1413import Events , { extractWorkspaceDetails } from 'src/libs/events' ;
15- import { isFeaturePreviewEnabled } from 'src/libs/feature-previews' ;
1614import { asMockedFn , partial , renderWithAppContexts as render , SelectHelper } from 'src/testing/test-utils' ;
1715import { defaultGoogleWorkspace , makeGoogleWorkspace } from 'src/testing/workspace-fixtures' ;
1816import SettingsModal from 'src/workspaces/SettingsModal/SettingsModal' ;
@@ -133,16 +131,6 @@ describe('SettingsModal', () => {
133131 config : { enabled : false } ,
134132 } ;
135133
136- const improvedDataTablesEnabledSetting : ImprovedDataTablesSetting = {
137- settingType : 'CompactDataTables' ,
138- config : { enabled : true } ,
139- } ;
140-
141- const improvedDataTablesDisabledSetting : ImprovedDataTablesSetting = {
142- settingType : 'CompactDataTables' ,
143- config : { enabled : false } ,
144- } ;
145-
146134 const separateSubmissionOutputsDisabledSetting : SeparateSubmissionFinalOutputsSetting = {
147135 settingType : 'SeparateSubmissionFinalOutputs' ,
148136 config : { enabled : false } ,
@@ -189,10 +177,6 @@ describe('SettingsModal', () => {
189177 asMockedFn ( isWorkspaceOwner ) . mockReturnValue ( false ) ;
190178 } ;
191179
192- const enableFeaturePreview = ( ) => {
193- asMockedFn ( isFeaturePreviewEnabled ) . mockReturnValue ( true ) ; // Mock IMPROVED_DATA_TABLES as enabled
194- } ;
195-
196180 it ( 'has no accessibility errors' , async ( ) => {
197181 // Arrange
198182 setup ( [ twoRules ] , jest . fn ( ) ) ;
@@ -926,129 +910,6 @@ describe('SettingsModal', () => {
926910 } ) ;
927911 } ) ;
928912
929- describe ( 'Improved DataTables Settings' , ( ) => {
930- const getImprovedDataTablesToggle = ( ) => screen . getByLabelText ( 'Improved Data Tables:' ) ;
931-
932- it ( 'renders the option as disabled if the user is not an owner' , async ( ) => {
933- // Arrange
934- setup ( [ ] , jest . fn ( ) ) ;
935- mockNotOwner ( ) ;
936- enableFeaturePreview ( ) ;
937-
938- // Act
939- await act ( async ( ) => {
940- render ( < SettingsModal workspace = { makeGoogleWorkspace ( { accessLevel : 'READER' } ) } onDismiss = { jest . fn ( ) } /> ) ;
941- } ) ;
942-
943- // Assert
944- expect ( getImprovedDataTablesToggle ( ) ) . toBeDisabled ( ) ;
945- } ) ;
946-
947- it ( 'renders the option as off if no settings exist' , async ( ) => {
948- // Arrange
949- setup ( [ ] , jest . fn ( ) ) ;
950- mockNotOwner ( ) ;
951- enableFeaturePreview ( ) ;
952-
953- // Act
954- await act ( async ( ) => {
955- render ( < SettingsModal workspace = { defaultGoogleWorkspace } onDismiss = { jest . fn ( ) } /> ) ;
956- } ) ;
957-
958- // Assert
959- expect ( getImprovedDataTablesToggle ( ) ) . not . toBeChecked ( ) ;
960- } ) ;
961-
962- it ( 'renders the option as off if improved data tables is disabled' , async ( ) => {
963- // Arrange
964- setup ( [ improvedDataTablesDisabledSetting ] , jest . fn ( ) ) ;
965- enableFeaturePreview ( ) ;
966-
967- // Act
968- await act ( async ( ) => {
969- render ( < SettingsModal workspace = { defaultGoogleWorkspace } onDismiss = { jest . fn ( ) } /> ) ;
970- } ) ;
971-
972- // Assert
973- expect ( getImprovedDataTablesToggle ( ) ) . not . toBeChecked ( ) ;
974- } ) ;
975-
976- it ( 'renders the option as on but disabled if improved data tables is enabled' , async ( ) => {
977- // Arrange
978- setup ( [ improvedDataTablesEnabledSetting ] , jest . fn ( ) ) ;
979- enableFeaturePreview ( ) ;
980-
981- // Act
982- await act ( async ( ) => {
983- render ( < SettingsModal workspace = { defaultGoogleWorkspace } onDismiss = { jest . fn ( ) } /> ) ;
984- } ) ;
985-
986- // Assert
987- expect ( getImprovedDataTablesToggle ( ) ) . toBeChecked ( ) ;
988- expect ( getImprovedDataTablesToggle ( ) ) . toBeDisabled ( ) ;
989- } ) ;
990-
991- it ( 'does not support disabling improved data tables' , async ( ) => {
992- // Arrange
993- const updateSettingsMock = jest . fn ( ) ;
994- setup ( [ improvedDataTablesEnabledSetting ] , updateSettingsMock ) ;
995- enableFeaturePreview ( ) ;
996-
997- // Act
998- await act ( async ( ) => {
999- render ( < SettingsModal workspace = { defaultGoogleWorkspace } onDismiss = { jest . fn ( ) } /> ) ;
1000- } ) ;
1001-
1002- const toggle = getImprovedDataTablesToggle ( ) ;
1003- expect ( toggle ) . toBeDisabled ( ) ;
1004- } ) ;
1005-
1006- it ( 'supports enabling improved data tables' , async ( ) => {
1007- // Arrange
1008- const user = userEvent . setup ( ) ;
1009- const updateSettingsMock = jest . fn ( ) ;
1010- setup ( [ ] , updateSettingsMock ) ;
1011- enableFeaturePreview ( ) ;
1012-
1013- // Act
1014- await act ( async ( ) => {
1015- render ( < SettingsModal workspace = { defaultGoogleWorkspace } onDismiss = { jest . fn ( ) } /> ) ;
1016- } ) ;
1017-
1018- const toggle = getImprovedDataTablesToggle ( ) ;
1019- expect ( toggle ) . not . toBeChecked ( ) ;
1020- await user . click ( toggle ) ;
1021- expect ( toggle ) . toBeChecked ( ) ;
1022-
1023- await user . click ( screen . getByRole ( 'button' , { name : 'Save' } ) ) ;
1024-
1025- // Assert
1026- expect ( updateSettingsMock ) . toHaveBeenCalledWith ( [ improvedDataTablesEnabledSetting , defaultSoftDeleteSetting ] ) ;
1027- expect ( captureEvent ) . toHaveBeenCalledWith ( Events . workspaceSettingsImprovedDataTables , {
1028- enabled : true ,
1029- ...extractWorkspaceDetails ( defaultGoogleWorkspace ) ,
1030- } ) ;
1031- } ) ;
1032-
1033- it ( 'does not event if improved data tables did not change' , async ( ) => {
1034- // Arrange
1035- const updateSettingsMock = jest . fn ( ) ;
1036- setup ( [ improvedDataTablesEnabledSetting ] , updateSettingsMock ) ;
1037- enableFeaturePreview ( ) ;
1038-
1039- // Act
1040- await act ( async ( ) => {
1041- render ( < SettingsModal workspace = { defaultGoogleWorkspace } onDismiss = { jest . fn ( ) } /> ) ;
1042- } ) ;
1043- const toggle = getImprovedDataTablesToggle ( ) ;
1044- expect ( toggle ) . toBeDisabled ( ) ;
1045-
1046- // Assert
1047- expect ( updateSettingsMock ) . not . toHaveBeenCalledWith ( [ improvedDataTablesEnabledSetting , defaultSoftDeleteSetting ] ) ;
1048- expect ( captureEvent ) . not . toHaveBeenCalledWith ( ) ;
1049- } ) ;
1050- } ) ;
1051-
1052913 describe ( 'Workspace Analysis Log Retention Settings' , ( ) => {
1053914 const getRetentionDaysElement = ( ) => screen . getAllByLabelText ( 'Days to retain:' ) [ 1 ] ;
1054915
0 commit comments