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.

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

Added image-builder-frontend repository as a Cockpit package #2424

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
24 changes: 24 additions & 0 deletions src/store/cockpitApi.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { emptyCockpitApi as api } from './emptyCockpitApi';
import {
GetBlueprintsApiArg,
GetBlueprintsApiResponse,
} from './imageBuilderApi';

// Injects API endpoints into the service for querying blueprints
export const blueprintsReducer = api.injectEndpoints({
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, but we need to teach it how to actually return a GetBlueprintsApiResponse object.

You'll want to use a queryFn, check the RTKQ docs here:
https://redux-toolkit.js.org/rtk-query/usage/customizing-queries#customizing-queries-with-queryfn

You might want to use the Cockpit Files API to read in the blueprints from a directory, docs here: https://cockpit-project.org/guide/latest/cockpit-file

We haven't 100% decided on the directory yet, but perhaps ~/.local/share/image-builder/blueprints.

endpoints: (build) => ({
getBlueprints: build.query<GetBlueprintsApiResponse, GetBlueprintsApiArg>({
query: (queryArg) => ({
url: `/blueprints`,
params: {
name: queryArg.name,
search: queryArg.search,
limit: queryArg.limit,
offset: queryArg.offset,
},
}),
}),
}),
});

export const { useGetBlueprintsQuery } = blueprintsReducer;
8 changes: 8 additions & 0 deletions src/store/emptyCockpitApi.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';

// initialize an empty api service that we'll inject endpoints into later as needed
export const emptyCockpitApi = createApi({
reducerPath: 'cockpitApi',
baseQuery: fetchBaseQuery({ baseUrl: '/api' }),
endpoints: () => ({}),
});
41 changes: 37 additions & 4 deletions src/store/index.ts
mgold1234 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { combineReducers, configureStore } from '@reduxjs/toolkit';
import promiseMiddleware from 'redux-promise-middleware';

import { blueprintsSlice } from './BlueprintSlice';
import { blueprintsReducer } from './cockpitApi';
import { complianceApi } from './complianceApi';
import { contentSourcesApi } from './contentSourcesApi';
import { edgeApi } from './edgeApi';
Expand All @@ -19,13 +20,26 @@ import wizardSlice, {
selectImageTypes,
} from './wizardSlice';

export const reducer = combineReducers({
import { isOnPremise } from '../constants';

export const serviceReducer = combineReducers({
[contentSourcesApi.reducerPath]: contentSourcesApi.reducer,
[edgeApi.reducerPath]: edgeApi.reducer,
[imageBuilderApi.reducerPath]: imageBuilderApi.reducer,
[rhsmApi.reducerPath]: rhsmApi.reducer,
[provisioningApi.reducerPath]: provisioningApi.reducer,
[complianceApi.reducerPath]: complianceApi.reducer,
[blueprintsReducer.reducerPath]: blueprintsReducer.reducer,
mgold1234 marked this conversation as resolved.
Show resolved Hide resolved
notifications: notificationsReducer,
wizard: wizardSlice,
blueprints: blueprintsSlice.reducer,
});

export const onPremReducer = combineReducers({
[contentSourcesApi.reducerPath]: contentSourcesApi.reducer,
[imageBuilderApi.reducerPath]: imageBuilderApi.reducer,
[rhsmApi.reducerPath]: rhsmApi.reducer,
[blueprintsReducer.reducerPath]: blueprintsReducer.reducer,
notifications: notificationsReducer,
wizard: wizardSlice,
blueprints: blueprintsSlice.reducer,
Expand Down Expand Up @@ -88,7 +102,7 @@ startAppListening({
// Listener middleware must be prepended according to RTK docs:
// https://redux-toolkit.js.org/api/createListenerMiddleware#basic-usage
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
export const middleware = (getDefaultMiddleware: Function) =>
export const serviceMiddleware = (getDefaultMiddleware: Function) =>
getDefaultMiddleware()
.prepend(listenerMiddleware.middleware)
.concat(
Expand All @@ -97,10 +111,29 @@ export const middleware = (getDefaultMiddleware: Function) =>
imageBuilderApi.middleware,
rhsmApi.middleware,
provisioningApi.middleware,
complianceApi.middleware
complianceApi.middleware,
blueprintsReducer.middleware
);

export const store = configureStore({ reducer, middleware });
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
export const onPremMiddleware = (getDefaultMiddleware: Function) =>
getDefaultMiddleware()
.prepend(listenerMiddleware.middleware)
.concat(
promiseMiddleware,
contentSourcesApi.middleware,
imageBuilderApi.middleware,
rhsmApi.middleware,
blueprintsReducer.middleware
);

const rootReducer = isOnPremise ? onPremReducer : serviceReducer;
const rootMiddleware = isOnPremise ? onPremMiddleware : serviceMiddleware;

export const store = configureStore({
reducer: rootReducer,
middleware: rootMiddleware,
});

// Infer the `RootState` and `AppDispatch` types from the store itself
export type RootState = ReturnType<typeof store.getState>;
Expand Down