Directly patch posterminalIds in Redux instead of reloading the category tree
After toggling a POS category, update the category's posterminalIds array in-place rather than re-fetching the entire tree. This keeps the settings cycle open on the same terminal. Also fix off-by-one in terminal cycling and ensure posterminals load on category page mount.
This commit is contained in:
@@ -283,7 +283,7 @@ export class CategoryEditTile extends Component {
|
||||
const terminalCount = terminals?.length || 0;
|
||||
this.setState((prev) => {
|
||||
const next = prev.settingsTab + 1;
|
||||
const nextTab = next > terminalCount ? -1 : next;
|
||||
const nextTab = next >= terminalCount ? -1 : next;
|
||||
console.log('[CategoryEditTile] settings toggle', {
|
||||
terminals: terminals?.length,
|
||||
terminalCount,
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
import withCategoryRoute from './withCategoryRoute';
|
||||
import { artikelDetailPath, articleSku } from './articleRoute';
|
||||
import { selectCompanyId } from '../../store/companySlice';
|
||||
import { selectHasPosterminals, selectPosterminals } from '../../store/posterminalSlice';
|
||||
import { selectHasPosterminals, selectPosterminals, loadPosterminals } from '../../store/posterminalSlice';
|
||||
import {
|
||||
buildCategoryPath,
|
||||
defaultCategoryPath,
|
||||
@@ -47,6 +47,7 @@ import {
|
||||
selectCategoryTreeStatus,
|
||||
selectChildCategories,
|
||||
selectRenameMode,
|
||||
patchCategoryPosterminalIds,
|
||||
} from '../../store/categorySlice';
|
||||
import {
|
||||
enableTerminalCategory,
|
||||
@@ -72,6 +73,7 @@ class ArtikelKategorienPage extends Component {
|
||||
|
||||
componentDidMount() {
|
||||
this.ensureTreeLoaded();
|
||||
this.ensurePosterminalsLoaded();
|
||||
this.syncCategoryFromUrl();
|
||||
this.ensureArticlesLoaded();
|
||||
this.syncSortable();
|
||||
@@ -158,6 +160,12 @@ class ArtikelKategorienPage extends Component {
|
||||
this.props.loadCategoryTree();
|
||||
};
|
||||
|
||||
ensurePosterminalsLoaded = () => {
|
||||
const { companyId } = this.props;
|
||||
if (!companyId) return;
|
||||
this.props.loadPosterminals();
|
||||
};
|
||||
|
||||
ensureArticlesLoaded = () => {
|
||||
const { currentCategoryId, articlesStatus, rootCategoryId, treeStatus } = this.props;
|
||||
if (treeStatus !== 'succeeded' || !currentCategoryId || articlesStatus !== 'idle') return;
|
||||
@@ -356,7 +364,13 @@ class ArtikelKategorienPage extends Component {
|
||||
: this.props.disableTerminalCategory;
|
||||
void thunk({ terminalId, categoryId: item.id })
|
||||
.unwrap()
|
||||
.then(() => this.props.loadCategoryTree())
|
||||
.then(() => {
|
||||
this.props.patchCategoryPosterminalIds({
|
||||
categoryId: item.id,
|
||||
terminalId,
|
||||
enabled,
|
||||
});
|
||||
})
|
||||
.catch(notifyError);
|
||||
}}
|
||||
onOpen={() => this.navigateToCategoryById(item.id)}
|
||||
@@ -456,6 +470,7 @@ const mapStateToProps = (state) => ({
|
||||
const mapDispatchToProps = {
|
||||
loadCategoryTree,
|
||||
loadCategoryArticles,
|
||||
loadPosterminals,
|
||||
navigateToCategory,
|
||||
renameCategory,
|
||||
deleteCategory,
|
||||
@@ -464,6 +479,7 @@ const mapDispatchToProps = {
|
||||
toggleCategoryPos,
|
||||
enableTerminalCategory,
|
||||
disableTerminalCategory,
|
||||
patchCategoryPosterminalIds,
|
||||
};
|
||||
|
||||
export default withCategoryRoute(connect(mapStateToProps, mapDispatchToProps)(ArtikelKategorienPage));
|
||||
|
||||
@@ -291,6 +291,17 @@ const categorySlice = createSlice({
|
||||
resetCategoryState() {
|
||||
return initialState;
|
||||
},
|
||||
patchCategoryPosterminalIds(state, action) {
|
||||
const { categoryId, terminalId, enabled } = action.payload;
|
||||
const cat = state.categories?.[String(categoryId)];
|
||||
if (!cat) return;
|
||||
if (!Array.isArray(cat.posterminalIds)) cat.posterminalIds = [];
|
||||
if (enabled && !cat.posterminalIds.includes(terminalId)) {
|
||||
cat.posterminalIds.push(terminalId);
|
||||
} else if (!enabled) {
|
||||
cat.posterminalIds = cat.posterminalIds.filter((id) => id !== terminalId);
|
||||
}
|
||||
},
|
||||
setRenameMode(state, action) {
|
||||
state.renameMode = Boolean(action.payload);
|
||||
},
|
||||
@@ -451,6 +462,7 @@ export const {
|
||||
setRenameMode,
|
||||
removeArticleBySku,
|
||||
patchArticleInLists,
|
||||
patchCategoryPosterminalIds,
|
||||
} = categorySlice.actions;
|
||||
|
||||
export const selectRenameMode = (state) => state.category.renameMode;
|
||||
|
||||
@@ -253,8 +253,9 @@ export function posterminalLoadListener(listenerMiddleware) {
|
||||
loginWithGoogle.fulfilled.match(action) ||
|
||||
selectCompany.fulfilled.match(action) ||
|
||||
createCompany.fulfilled.match(action),
|
||||
effect: async (_action, api) => {
|
||||
effect: async (action, api) => {
|
||||
const companyId = api.getState().auth.user?.selectedCompanyId;
|
||||
console.log('[posterminalLoadListener]', action.type, { companyId });
|
||||
if (companyId) {
|
||||
api.dispatch(loadPosterminals());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user