Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: TemporaryStorageField widget #1215

Merged
merged 1 commit into from
Oct 9, 2024
Merged

fix: TemporaryStorageField widget #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/common/src/dto/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ export interface IDevWorkspaceList {
export interface IDevWorkspaceResources {
devfileContent: string | undefined;
editorPath: string | undefined;
pluginRegistryUrl: string | undefined;
editorId: string | undefined;
editorContent: string | undefined;
}

Expand Down
6 changes: 3 additions & 3 deletions packages/dashboard-backend/src/routes/api/devworkspaceResources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ export function registerDevworkspaceResourcesRoute(instance: FastifyInstance) {
`${baseApiPath}/devworkspace-resources`,
getSchema({ tags, body: devWorkspaceResourcesSchema }),
async function (request: FastifyRequest) {
const { devfileContent, editorPath, pluginRegistryUrl, editorId, editorContent } =
const { devfileContent, editorPath, editorContent } =
request.body as api.IDevWorkspaceResources;
const context = await generator.generateDevfileContext(
{
devfileContent,
editorPath,
pluginRegistryUrl,
editorEntry: editorId,
pluginRegistryUrl: undefined,
editorEntry: undefined,
editorContent,
projects: [],
},
Expand Down
8 changes: 4 additions & 4 deletions ...dion/AdvancedOptions/CreateNewIfExistingField/__tests__/__snapshots__/index.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ exports[`TemporaryStorageField switched off snapshot 1`] = `
data-ouia-component-id="OUIA-Generated-Switch-1"
data-ouia-component-type="PF4/Switch"
data-ouia-safe={true}
htmlFor="temporary-storage-switch"
htmlFor="adv-temporary-storage-switch"
>
<input
aria-label="Temporary Storage"
aria-labelledby={null}
checked={false}
className="pf-c-switch__input"
disabled={false}
id="temporary-storage-switch"
id="adv-temporary-storage-switch"
onChange={[Function]}
type="checkbox"
/>
Expand Down Expand Up @@ -92,15 +92,15 @@ exports[`TemporaryStorageField switched on snapshot 1`] = `
data-ouia-component-id="OUIA-Generated-Switch-2"
data-ouia-component-type="PF4/Switch"
data-ouia-safe={true}
htmlFor="temporary-storage-switch"
htmlFor="adv-temporary-storage-switch"
>
<input
aria-label="Temporary Storage"
aria-labelledby={null}
checked={true}
className="pf-c-switch__input"
disabled={false}
id="temporary-storage-switch"
id="adv-temporary-storage-switch"
onChange={[Function]}
type="checkbox"
/>
Expand Down
8 changes: 4 additions & 4 deletions ...cordion/AdvancedOptions/TemporaryStorageField/__tests__/__snapshots__/index.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ exports[`TemporaryStorageField switched off snapshot 1`] = `
data-ouia-component-id="OUIA-Generated-Switch-1"
data-ouia-component-type="PF4/Switch"
data-ouia-safe={true}
htmlFor="temporary-storage-switch"
htmlFor="adv-temporary-storage-switch"
>
<input
aria-label="Temporary Storage"
aria-labelledby={null}
checked={false}
className="pf-c-switch__input"
disabled={false}
id="temporary-storage-switch"
id="adv-temporary-storage-switch"
onChange={[Function]}
type="checkbox"
/>
Expand Down Expand Up @@ -92,15 +92,15 @@ exports[`TemporaryStorageField switched on snapshot 1`] = `
data-ouia-component-id="OUIA-Generated-Switch-2"
data-ouia-component-type="PF4/Switch"
data-ouia-safe={true}
htmlFor="temporary-storage-switch"
htmlFor="adv-temporary-storage-switch"
>
<input
aria-label="Temporary Storage"
aria-labelledby={null}
checked={true}
className="pf-c-switch__input"
disabled={false}
id="temporary-storage-switch"
id="adv-temporary-storage-switch"
onChange={[Function]}
type="checkbox"
/>
Expand Down
2 changes: 1 addition & 1 deletion ...onents/ImportFromGit/RepoOptionsAccordion/AdvancedOptions/TemporaryStorageField/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class TemporaryStorageField extends React.PureComponent<Props, State> {
return (
<FormGroup label="Temporary Storage">
<Switch
id="temporary-storage-switch"
id="adv-temporary-storage-switch"
aria-label="Temporary Storage"
isChecked={isTemporary}
onChange={value => this.handleChange(value)}
Expand Down
29 changes: 3 additions & 26 deletions packages/dashboard-frontend/src/services/workspace-client/__tests__/helpers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ describe('Workspace-client helpers', () => {
});

describe('Look for the custom editor', () => {
const pluginRegistryUrl = 'https://dummy-plugin-registry';
let optionalFilesContent: { [fileName: string]: string };
let editor: devfileApi.Devfile;

Expand All @@ -285,7 +284,6 @@ describe('Workspace-client helpers', () => {
it('should return undefined without optionalFilesContent', async () => {
const store = new FakeStoreBuilder().build();
const customEditor = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
Expand All @@ -300,7 +298,6 @@ describe('Workspace-client helpers', () => {
const store = new FakeStoreBuilder().build();

const customEditor = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
Expand All @@ -324,7 +321,6 @@ describe('Workspace-client helpers', () => {
const store = new FakeStoreBuilder().build();

const customEditor = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
Expand All @@ -342,12 +338,7 @@ describe('Workspace-client helpers', () => {
let errorText: string | undefined;

try {
await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
);
await getCustomEditor(optionalFilesContent, store.dispatch, store.getState);
} catch (e) {
errorText = common.helpers.errors.getMessage(e);
}
Expand Down Expand Up @@ -393,7 +384,6 @@ describe('Workspace-client helpers', () => {
.build();

const customEditor = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
Expand Down Expand Up @@ -452,7 +442,6 @@ describe('Workspace-client helpers', () => {
.build();

const customEditor = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
Expand Down Expand Up @@ -505,12 +494,7 @@ describe('Workspace-client helpers', () => {

let errorText: string | undefined;
try {
await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
);
await getCustomEditor(optionalFilesContent, store.dispatch, store.getState);
} catch (e) {
errorText = common.helpers.errors.getMessage(e);
}
Expand Down Expand Up @@ -539,7 +523,6 @@ describe('Workspace-client helpers', () => {
.build();

const customEditor = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
Expand Down Expand Up @@ -573,7 +556,6 @@ describe('Workspace-client helpers', () => {
.build();

const customEditor = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
Expand Down Expand Up @@ -602,12 +584,7 @@ describe('Workspace-client helpers', () => {

let errorText: string | undefined;
try {
await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
store.dispatch,
store.getState,
);
await getCustomEditor(optionalFilesContent, store.dispatch, store.getState);
} catch (e) {
errorText = common.helpers.errors.getMessage(e);
}
Expand Down
1 change: 0 additions & 1 deletion packages/dashboard-frontend/src/services/workspace-client/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ export const CHE_EDITOR_YAML_PATH = '.che/che-editor.yaml';
* Look for the custom editor in .che/che-editor.yaml
*/
export async function getCustomEditor(
pluginRegistryUrl: string | undefined,
optionalFilesContent: { [fileName: string]: string },
dispatch: ThunkDispatch<AppState, unknown, KnownAction>,
getState: () => AppState,
Expand Down
12 changes: 1 addition & 11 deletions packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,10 +721,8 @@ export const actionCreators: ActionCreators = {
editorContent = updateEditorDevfile(editorContent, editorImage);
}
const resourcesContent = await fetchResources({
pluginRegistryUrl,
devfileContent: dump(defaultsDevfile),
editorPath: undefined,
editorId: undefined,
editorContent,
});
const resources = loadResourcesContent(resourcesContent);
Expand Down Expand Up @@ -877,7 +875,6 @@ export const actionCreators: ActionCreators = {
): AppThunk<KnownAction, Promise<void>> =>
async (dispatch, getState): Promise<void> => {
const state = getState();
const pluginRegistryUrl = selectPluginRegistryUrl(state);
let devWorkspaceResource: devfileApi.DevWorkspace;
let devWorkspaceTemplateResource: devfileApi.DevWorkspaceTemplate;
let editorContent: string | undefined;
Expand All @@ -895,12 +892,7 @@ export const actionCreators: ActionCreators = {
} else {
// do we have the custom editor in `.che/che-editor.yaml` ?
try {
editorContent = await getCustomEditor(
pluginRegistryUrl,
optionalFilesContent,
dispatch,
getState,
);
editorContent = await getCustomEditor(optionalFilesContent, dispatch, getState);
if (!editorContent) {
console.warn('No custom editor found');
}
Expand Down Expand Up @@ -932,10 +924,8 @@ export const actionCreators: ActionCreators = {
}
editorContent = updateEditorDevfile(editorContent, params.editorImage);
const resourcesContent = await fetchResources({
pluginRegistryUrl,
devfileContent: dump(devfile),
editorPath: undefined,
editorId: undefined,
editorContent: editorContent,
});
const resources = loadResourcesContent(resourcesContent);
Expand Down
Loading