Skip to content

Commit edce4db

Browse files
wg102wg102
authored
Remove all image one and image three ref (#320)
* Remove all image one and image three ref * Remove cypress tests
1 parent d63f302 commit edce4db

15 files changed

+0
-256
lines changed

‎config.go

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import (
88

99
type SpawnerFormDefaults struct {
1010
Image Image `yaml:"image" json:"image"`
11-
ImageGroupOne ImageGroup `yaml:"imageGroupOne" json:"imageGroupOne"`
12-
ImageGroupTwo ImageGroup `yaml:"imageGroupTwo" json:"imageGroupTwo"`
1311
ImageGroupThree ImageGroup `yaml:"imageGroupThree" json:"imageGroupThree"`
1412
AllowCustomImage bool `yaml:"allowCustomImage" json:"allowCustomImage"`
1513
ImagePullPolicy ImagePullPolicy `yaml:"imagePullPolicy" json:"imagePullPolicy"`

‎frontend/jupyter/cypress/e2e/form-page.cy.ts

-53
Original file line numberDiff line numberDiff line change
@@ -767,59 +767,6 @@ describe('New notebook form', () => {
767767
cy.url().should('eq', 'http://localhost:4200/');
768768
});
769769

770-
it('should create a RStudio notebook in french with data volumes', () => {
771-
cy.get('lib-name-input[resourcename="Notebook Server"]')
772-
.find('input')
773-
.type('test-notebook-rstudio');
774-
// select rstudio notebook
775-
cy.get(
776-
'[data-cy-form-input="serverType"] > mat-button-toggle[value="group-one"]',
777-
).click();
778-
cy.get('[data-cy-advanced-options-button]').click();
779-
//add data volumes
780-
cy.get('[data-cy-form-button="dataVolumes-new"]').click();
781-
cy.get('[data-cy-form-button="dataVolumes-existing"]').click();
782-
cy.get('[data-cy-form-button="submit"]').should('be.disabled');
783-
cy.get('[data-cy-form-input="dataVolumes"]')
784-
.find('[data-cy-form-input="existing-volume"]')
785-
.click();
786-
cy.get('[role="listbox"] > mat-option')
787-
.contains('a-pvc-phase-ready-viewer-ready')
788-
.click();
789-
// change language to french
790-
cy.get('[data-cy-form-input="language"]').click();
791-
cy.get('[role="listbox"] > mat-option').contains('Français').click();
792-
// submit the notebook
793-
cy.get('[data-cy-form-button="submit"]').should('be.enabled');
794-
cy.intercept('POST', 'api/namespaces/kubeflow-user/notebooks', {
795-
success: true,
796-
status: 200,
797-
}).as('mockSubmitNotebook');
798-
cy.get('[data-cy-form-button="submit"]').click();
799-
cy.wait('@mockSubmitNotebook');
800-
cy.url().should('eq', 'http://localhost:4200/');
801-
});
802-
803-
it('should create a protected B Ubuntu notebook', () => {
804-
cy.get('lib-name-input[resourcename="Notebook Server"]')
805-
.find('input')
806-
.type('test-notebook-protectedb');
807-
// select ubuntu notebook
808-
cy.get(
809-
'[data-cy-form-input="serverType"] > mat-button-toggle[value="group-two"]',
810-
).click();
811-
cy.get('[data-cy-form-input="prob"]').click();
812-
// submit the notebook
813-
cy.get('[data-cy-form-button="submit"]').should('be.enabled');
814-
cy.intercept('POST', 'api/namespaces/kubeflow-user/notebooks', {
815-
success: true,
816-
status: 200,
817-
}).as('mockSubmitNotebook');
818-
cy.get('[data-cy-form-button="submit"]').click();
819-
cy.wait('@mockSubmitNotebook');
820-
cy.url().should('eq', 'http://localhost:4200/');
821-
});
822-
823770
it('should create a SAS notebook', () => {
824771
cy.get('lib-name-input[resourcename="Notebook Server"]')
825772
.find('input')

‎frontend/jupyter/cypress/fixtures/config.json

-12
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@
1414
"hideRegistry":false,
1515
"hideVersion":false
1616
},
17-
"imageGroupOne":{
18-
"value":"k8scc01covidacr.azurecr.io/rstudio:v1",
19-
"options":[
20-
"k8scc01covidacr.azurecr.io/rstudio:v1"
21-
]
22-
},
23-
"imageGroupTwo":{
24-
"value":"k8scc01covidacr.azurecr.io/remote-desktop:v1",
25-
"options":[
26-
"k8scc01covidacr.azurecr.io/remote-desktop:v1"
27-
]
28-
},
2917
"imageGroupThree":{
3018
"disabledMessage":{
3119
"en":"SAS is unavailable while non-employees have access to this profile.",

‎frontend/jupyter/src/app/pages/form/form-new/form-image-custom/form-image-custom.component.html

-48
Original file line numberDiff line numberDiff line change
@@ -20,54 +20,6 @@
2020
<mat-error i18n>Please provide an Image to use</mat-error>
2121
</mat-form-field>
2222

23-
<mat-form-field
24-
class="wide"
25-
appearance="outline"
26-
*ngIf="parentForm?.value.serverType === 'group-one'"
27-
data-cy-form-input="serverImage"
28-
>
29-
<!-- If readonly, then make it an input element instead of select -->
30-
<mat-label i18n>Image</mat-label>
31-
<mat-select
32-
placeholder="OCI Image"
33-
i18n-placeholder
34-
[formControl]="parentForm.get('imageGroupOne')"
35-
>
36-
<mat-option
37-
*ngFor="let img of imagesGroupOne.options"
38-
[value]="img"
39-
[matTooltip]="img"
40-
>
41-
{{ imageDisplayName(img) }}
42-
</mat-option>
43-
</mat-select>
44-
<mat-error i18n>Please provide an Image to use</mat-error>
45-
</mat-form-field>
46-
47-
<mat-form-field
48-
class="wide"
49-
appearance="outline"
50-
*ngIf="parentForm?.value.serverType === 'group-two'"
51-
data-cy-form-input="serverImage"
52-
>
53-
<!-- If readonly, then make it an input element instead of select -->
54-
<mat-label i18n>Image</mat-label>
55-
<mat-select
56-
placeholder="OCI Image"
57-
i18n-placeholder
58-
[formControl]="parentForm.get('imageGroupTwo')"
59-
>
60-
<mat-option
61-
*ngFor="let img of imagesGroupTwo.options"
62-
[value]="img"
63-
[matTooltip]="img"
64-
>
65-
{{ imageDisplayName(img) }}
66-
</mat-option>
67-
</mat-select>
68-
<mat-error i18n>Please provide an Image to use</mat-error>
69-
</mat-form-field>
70-
7123
<mat-form-field
7224
class="wide"
7325
appearance="outline"

‎frontend/jupyter/src/app/pages/form/form-new/form-image-custom/form-image-custom.component.spec.ts

-8
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ describe('FormImageCustomComponent', () => {
4949
customImage: new UntypedFormControl(),
5050
customImageCheck: new UntypedFormControl(),
5151
image: new UntypedFormControl(),
52-
imageGroupOne: new UntypedFormControl(),
53-
imageGroupTwo: new UntypedFormControl(),
5452
imageGroupThree: new UntypedFormControl(),
5553
});
5654

@@ -63,24 +61,18 @@ describe('FormImageCustomComponent', () => {
6361

6462
it('should toggle image controls when custom image is checked', () => {
6563
const image = component.parentForm.get('image');
66-
const imageGroupOne = component.parentForm.get('imageGroupOne');
67-
const imageGroupTwo = component.parentForm.get('imageGroupTwo');
6864
const imageGroupThree = component.parentForm.get('imageGroupThree');
6965

7066
let event = { checked: true } as MatCheckboxChange;
7167
component.onSelect(event);
7268

7369
expect(image.disabled).toBe(true);
74-
expect(imageGroupOne.disabled).toBe(true);
75-
expect(imageGroupTwo.disabled).toBe(true);
7670
expect(imageGroupThree.disabled).toBe(true);
7771

7872
event = { checked: false } as MatCheckboxChange;
7973
component.onSelect(event);
8074

8175
expect(image.enabled).toBe(true);
82-
expect(imageGroupOne.enabled).toBe(true);
83-
expect(imageGroupTwo.enabled).toBe(true);
8476
expect(imageGroupThree.enabled).toBe(true);
8577
});
8678
});

‎frontend/jupyter/src/app/pages/form/form-new/form-image-custom/form-image-custom.component.ts

-8
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import { MatCheckboxChange } from '@angular/material/checkbox';
2727
export class FormImageCustomComponent implements OnInit, OnDestroy {
2828
@Input() parentForm: UntypedFormGroup;
2929
@Input() images: string[];
30-
@Input() imagesGroupOne: Config['imageGroupOne'];
31-
@Input() imagesGroupTwo: Config['imageGroupTwo'];
3230
@Input() imagesGroupThree: Config['imageGroupThree'];
3331
@Input() allowCustomImage: boolean;
3432
@Input() hideRegistry: boolean;
@@ -63,13 +61,9 @@ export class FormImageCustomComponent implements OnInit, OnDestroy {
6361
onSelect(event: MatCheckboxChange): void {
6462
if (event.checked) {
6563
this.parentForm.get('image').disable();
66-
this.parentForm.get('imageGroupOne').disable();
67-
this.parentForm.get('imageGroupTwo').disable();
6864
this.parentForm.get('imageGroupThree').disable();
6965
} else {
7066
this.parentForm.get('image').enable();
71-
this.parentForm.get('imageGroupOne').enable();
72-
this.parentForm.get('imageGroupTwo').enable();
7367
this.parentForm.get('imageGroupThree').enable();
7468
}
7569
}
@@ -141,8 +135,6 @@ export class FormImageCustomComponent implements OnInit, OnDestroy {
141135
const currentLanguage = this.localeId;
142136

143137
const msg = {
144-
'group-one': this.imagesGroupOne.disabledMessage,
145-
'group-two': this.imagesGroupTwo.disabledMessage,
146138
'group-three': this.imagesGroupThree.disabledMessage,
147139
};
148140

‎frontend/jupyter/src/app/pages/form/form-new/form-image/form-image.component.html

-41
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,6 @@
2020
</p>
2121
</mat-button-toggle>
2222

23-
<mat-button-toggle
24-
value="group-one"
25-
attr.aria-label="Use Group One based server"
26-
i18n-aria-label="Aria label for Group One server"
27-
[disabled]="!shouldEnable(imagesGroupOne?.enabledCondition)"
28-
[matTooltip]="
29-
!shouldEnable(imagesGroupOne?.enabledCondition)
30-
? getDisabledMessage('group-one')
31-
: ''
32-
"
33-
[class.toolbar-icon-disabled]="
34-
!shouldEnable(imagesGroupOne?.enabledCondition)
35-
"
36-
>
37-
<mat-icon class="server-type-icon" svgIcon="group-one"></mat-icon>
38-
<p class="server-type-title">RStudio</p>
39-
<p class="server-type-content" i18n>
40-
An integrated development environment for R, a programming language
41-
for statistical computing and graphics.
42-
</p>
43-
</mat-button-toggle>
44-
45-
<mat-button-toggle
46-
value="group-two"
47-
attr.aria-label="Use Group Two based server"
48-
i18n-aria-label="Aria label for Group Two server"
49-
[disabled]="!shouldEnable(imagesGroupTwo?.enabledCondition)"
50-
[matTooltip]="
51-
!shouldEnable(imagesGroupTwo?.enabledCondition)
52-
? getDisabledMessage('group-two')
53-
: ''
54-
"
55-
[class.toolbar-icon-disabled]="
56-
!shouldEnable(imagesGroupTwo?.enabledCondition)
57-
"
58-
>
59-
<mat-icon class="server-type-icon" svgIcon="group-two"></mat-icon>
60-
<p class="server-type-title">Ubuntu</p>
61-
<p class="server-type-content" i18n>An Ubuntu remote desktop.</p>
62-
</mat-button-toggle>
63-
6423
<mat-button-toggle
6524
value="group-three"
6625
attr.aria-label="Use Group Three based server"

‎frontend/jupyter/src/app/pages/form/form-new/form-image/form-image.component.spec.ts

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ describe('FormImageComponent', () => {
4646
customImage: new UntypedFormControl(),
4747
customImageCheck: new UntypedFormControl(),
4848
image: new UntypedFormControl(),
49-
imageGroupOne: new UntypedFormControl(),
50-
imageGroupTwo: new UntypedFormControl(),
5149
imageGroupThree: new UntypedFormControl(),
5250
serverType: new UntypedFormControl(),
5351
imagePullPolicy: new UntypedFormControl(),

‎frontend/jupyter/src/app/pages/form/form-new/form-image/form-image.component.ts

-20
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import { Config } from 'src/app/types';
2727
export class FormImageComponent implements OnInit, OnDestroy {
2828
@Input() parentForm: UntypedFormGroup;
2929
@Input() images: string[];
30-
@Input() imagesGroupOne: Config['imageGroupOne'];
31-
@Input() imagesGroupTwo: Config['imageGroupTwo'];
3230
@Input() imagesGroupThree: Config['imageGroupThree'];
3331
@Input() allowCustomImage: boolean;
3432
@Input() hideRegistry: boolean;
@@ -69,8 +67,6 @@ export class FormImageComponent implements OnInit, OnDestroy {
6967
.get('customImage')
7068
.setValidators([this.urlValidator(), Validators.required]);
7169
this.parentForm.get('image').setValidators([]);
72-
this.parentForm.get('imageGroupOne').setValidators([]);
73-
this.parentForm.get('imageGroupTwo').setValidators([]);
7470
this.parentForm.get('imageGroupThree').setValidators([]);
7571
}
7672
this.parentForm.get('serverType').valueChanges.subscribe(selection => {
@@ -79,40 +75,26 @@ export class FormImageComponent implements OnInit, OnDestroy {
7975
.get('customImage')
8076
.setValidators([this.urlValidator(), Validators.required]); //AAW
8177
this.parentForm.get('image').setValidators(Validators.required);
82-
this.parentForm.get('imageGroupOne').setValidators([]);
83-
this.parentForm.get('imageGroupTwo').setValidators([]);
8478
this.parentForm.get('imageGroupThree').setValidators([]);
8579
} else if (selection === 'group-one') {
8680
this.parentForm
8781
.get('customImage')
8882
.setValidators([this.urlValidator(), Validators.required]); //AAW
8983
this.parentForm.get('image').setValidators([]);
90-
this.parentForm
91-
.get('imageGroupOne')
92-
.setValidators(Validators.required);
93-
this.parentForm.get('imageGroupTwo').setValidators([]);
9484
this.parentForm.get('imageGroupThree').setValidators([]);
9585
} else if (selection === 'group-two') {
9686
this.parentForm
9787
.get('customImage')
9888
.setValidators([this.urlValidator(), Validators.required]); //AAW
9989
this.parentForm.get('image').setValidators([]);
100-
this.parentForm.get('imageGroupOne').setValidators([]);
101-
this.parentForm
102-
.get('imageGroupTwo')
103-
.setValidators(Validators.required);
10490
this.parentForm.get('imageGroupThree').setValidators([]);
10591
} else if (selection === 'group-three') {
10692
this.parentForm.get('image').setValidators([]);
107-
this.parentForm.get('imageGroupOne').setValidators([]);
108-
this.parentForm.get('imageGroupTwo').setValidators([]);
10993
this.parentForm
11094
.get('imageGroupThree')
11195
.setValidators(Validators.required);
11296
}
11397
this.parentForm.get('image').updateValueAndValidity();
114-
this.parentForm.get('imageGroupOne').updateValueAndValidity();
115-
this.parentForm.get('imageGroupTwo').updateValueAndValidity();
11698
this.parentForm.get('imageGroupThree').updateValueAndValidity();
11799
});
118100
this.parentForm.get('customImage').updateValueAndValidity();
@@ -153,8 +135,6 @@ export class FormImageComponent implements OnInit, OnDestroy {
153135
const currentLanguage = this.localeId;
154136

155137
const msg = {
156-
'group-one': this.imagesGroupOne.disabledMessage,
157-
'group-two': this.imagesGroupTwo.disabledMessage,
158138
'group-three': this.imagesGroupThree.disabledMessage,
159139
};
160140

‎frontend/jupyter/src/app/pages/form/form-new/form-new.component.html

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
<app-form-image
2424
[parentForm]="formCtrl"
2525
[images]="config?.image?.options"
26-
[imagesGroupOne]="config?.imageGroupOne"
27-
[imagesGroupTwo]="config?.imageGroupTwo"
2826
[imagesGroupThree]="config?.imageGroupThree"
2927
[allowCustomImage]="config?.allowCustomImage"
3028
[hideRegistry]="config?.hideRegistry"
@@ -38,8 +36,6 @@
3836
<app-form-image-custom
3937
[parentForm]="formCtrl"
4038
[images]="config?.image?.options"
41-
[imagesGroupOne]="config?.imageGroupOne"
42-
[imagesGroupTwo]="config?.imageGroupTwo"
4339
[imagesGroupThree]="config?.imageGroupThree"
4440
[allowCustomImage]="config?.allowCustomImage"
4541
[hideRegistry]="config?.hideRegistry"

‎frontend/jupyter/src/app/pages/form/form-new/form-new.component.ts

-8
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,12 @@ export class FormNewComponent
127127
} else {
128128
notebook.serverType = 'jupyter';
129129
}
130-
} else if (notebook.serverType === 'group-one') {
131-
// Set notebook image from imageGroupOne
132-
notebook.image = notebook.imageGroupOne;
133-
} else if (notebook.serverType === 'group-two') {
134-
// Set notebook image from imageGroupTwo
135-
notebook.image = notebook.imageGroupTwo;
136130
} else if (notebook.serverType === 'group-three') {
137131
// Set notebook image from imageGroupThree
138132
notebook.image = notebook.imageGroupThree;
139133
}
140134

141135
// Remove unnecessary images from the request sent to the backend
142-
delete notebook.imageGroupOne;
143-
delete notebook.imageGroupTwo;
144136
delete notebook.imageGroupThree;
145137

146138
// Ensure CPU input is a string

0 commit comments

Comments
 (0)