fix: incorrect state merging in redux store

[pujitm]

omit stale config entries while merging in new config state

Summary by CodeRabbit

• Refactor
  • Improved state update handling across several modules to enhance performance and maintain consistency without impacting user experience.

---

• To see the specific tasks where the Asana app for GitHub is being used, see below:
  • https://app.asana.com/0/0/1210628784568830

[coderabbitai]

Walkthrough

The Redux slices emhttp, dynamix, and registration have been updated to replace all uses of lodash's deep merge function with shallow Object.assign calls for state updates. Control flow and error handling remain unchanged.

Changes

File(s)	Change Summary
api/src/store/modules/emhttp.ts	Removed lodash merge; replaced deep merges with Object.assign for state updates.
api/src/store/modules/dynamix.ts	Replaced lodash merge with Object.assign in reducers and extraReducers for state updates.
api/src/store/modules/registration.ts	Removed lodash merge; replaced deep merge with shallow Object.assign for state updates.

Suggested reviewers

• mdatelle
• elibosley
• zackspear

Poem

Merges once deep, now shallow and bright,
Objects assigned with a flick and light.
Arrays untouched, no longer entwined,
Cleaner state updates, streamlined and refined.
✨🔄🎉

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 7a05106 and 9e8d542.

📒 Files selected for processing (2)

• api/src/store/modules/dynamix.ts (2 hunks)
• api/src/store/modules/emhttp.ts (2 hunks)

🚧 Files skipped from review as they are similar to previous changes (2)

• api/src/store/modules/dynamix.ts
• api/src/store/modules/emhttp.ts

⏰ Context from checks skipped due to timeout of 90000ms (6)

• GitHub Check: Build API
• GitHub Check: Build Web App
• GitHub Check: Build Unraid UI Library (Webcomponent Version)
• GitHub Check: Test API
• GitHub Check: Analyze (javascript-typescript)
• GitHub Check: Cloudflare Pages

✨ Finishing Touches

• 📝 Generate Docstrings

---

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Explain this complex logic.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai explain this code block.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and explain its main purpose.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (1)

api/src/store/modules/emhttp.ts (1)

167-174: Improve type safety of the custom merge function.

The custom merge function correctly implements array replacement logic, but the any types reduce type safety.

Consider improving type safety:

-const mergeReplaceArrays = (object: any, source: any, ...rest: any[]) =>
-    mergeWith(object, source, ...rest, (objValue: unknown, srcValue: unknown) => {
+const mergeReplaceArrays = <T extends Record<string, unknown>>(
+    object: T, 
+    source: Partial<T>, 
+    ...rest: Partial<T>[]
+) =>
+    mergeWith(object, source, ...rest, (objValue: unknown, srcValue: unknown) => {
         if (Array.isArray(srcValue)) {
             return srcValue;
         }
         return undefined;
     });

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between a7ef06e and fc6ae89.

📒 Files selected for processing (1)

• api/src/store/modules/emhttp.ts (4 hunks)

🧰 Additional context used

📓 Path-based instructions (1)

`api/**/*`: Use pnpm ONLY for package management. Always run scripts from api/pa...

api/**/*: Use pnpm ONLY for package management.
Always run scripts from api/package.json unless requested.
Test suite is VITEST, do not use jest.
Run tests with: pnpm --filter ./api test.

📄 Source: CodeRabbit Inference Engine (CLAUDE.md)

List of files the instruction was applied to:

• api/src/store/modules/emhttp.ts

⏰ Context from checks skipped due to timeout of 90000ms (5)

• GitHub Check: Build Web App
• GitHub Check: Build Unraid UI Library (Webcomponent Version)
• GitHub Check: Test API
• GitHub Check: Build API
• GitHub Check: Analyze (javascript-typescript)

🔇 Additional comments (5)

api/src/store/modules/emhttp.ts (5)

5-5: Import change enables custom merge behavior.

The switch from merge to mergeWith is correct and necessary for implementing the custom array replacement logic.

---

188-188: Correct usage of custom merge function in reducer.

The replacement of merge with mergeReplaceArrays properly implements the array replacement behavior for state updates.

---

197-197: Correct usage for successful state loading.

The custom merge function correctly handles the fulfilled case where action.payload contains valid state data.

---

206-206: Correct usage for single state file loading.

The custom merge function properly handles the conditional merging when action.payload contains valid state data.

---

201-201: ```shell
#!/bin/bash

1. Extract full createAsyncThunk payloadCreator for loadStateFiles

rg -A 40 -B 5 "export const loadStateFiles" api/src/store/modules/emhttp.ts

2. Find mergeReplaceArrays import in emhttp.ts to see its source

rg -n "mergeReplaceArrays" api/src/store/modules/emhttp.ts

3. Locate the implementation of mergeReplaceArrays in the repo

rg -A 10 -B 0 "export function mergeReplaceArrays" -t ts .

</details>

</blockquote></details>

</details>

<!-- This is an auto-generated comment by CodeRabbit for review status -->

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (1)

api/src/store/modules/dynamix.ts (1)

3-3: Remove unused import.

The merge import from lodash-es is no longer used after switching to Object.assign.

-import { merge } from 'lodash-es';

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between fc6ae89 and 7a05106.

📒 Files selected for processing (3)

• api/src/store/modules/dynamix.ts (2 hunks)
• api/src/store/modules/emhttp.ts (4 hunks)
• api/src/store/modules/registration.ts (2 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

• api/src/store/modules/emhttp.ts

🧰 Additional context used

📓 Path-based instructions (1)

`api/**/*`: Use pnpm ONLY for package management. Always run scripts from api/pa...

api/**/*: Use pnpm ONLY for package management.
Always run scripts from api/package.json unless requested.
Test suite is VITEST, do not use jest.
Run tests with: pnpm --filter ./api test.

📄 Source: CodeRabbit Inference Engine (CLAUDE.md)

List of files the instruction was applied to:

• api/src/store/modules/registration.ts
• api/src/store/modules/dynamix.ts

⏰ Context from checks skipped due to timeout of 90000ms (5)

• GitHub Check: Build Web App
• GitHub Check: Build Unraid UI Library (Webcomponent Version)
• GitHub Check: Build API
• GitHub Check: Test API
• GitHub Check: Analyze (javascript-typescript)

🔇 Additional comments (2)

api/src/store/modules/dynamix.ts (1)

23-23: Verify behavior change from deep merge to shallow merge.

The change from merge() to Object.assign() shifts from deep merging to shallow merging. This means nested objects will be completely replaced rather than recursively merged.

While this aligns with the PR objective to "omit stale configuration entries," ensure this doesn't break existing functionality that may rely on nested object merging.

#!/bin/bash
# Search for nested object usage in DynamixConfig type and related code
ast-grep --pattern 'updateDynamixConfig($_)'
rg -A 5 -B 5 'DynamixConfig.*{' 
rg -A 10 'updateDynamixConfig'

Also applies to: 32-32, 36-39

api/src/store/modules/registration.ts (1)

50-50: Consistent shallow merge implementation.

The changes correctly implement shallow merging with Object.assign(), consistent with the pattern in other Redux slices. The simpler state structure here (primitive types) makes the shallow vs deep merge distinction less critical.

#!/bin/bash
# Verify usage patterns for updateRegistrationState to ensure no breaking changes
ast-grep --pattern 'updateRegistrationState($_)'
rg -A 5 -B 5 'updateRegistrationState'

Also applies to: 59-59, 63-63

[github-actions]

This plugin has been deployed to Cloudflare R2 and is available for testing.
Download it at this URL:

https://preview.dl.unraid.net/unraid-api/tag/PR1437/dynamix.unraid.net.plg