fixed min time, draft logic

[Bhavya-egov]

No description provided.

[coderabbitai]

Walkthrough

Walkthrough

The recent updates primarily focus on improving the UploadData.js component within the campaign-manager module by fixing a typo, enhancing error handling, and refining the calculation logic for timeouts in conjunction with the useResourceData hook. These changes also introduce new configuration settings and update related files to ensure consistent and accurate functionality throughout the module.

Changes

File Path	Change Summary
.../components/UploadData.js	Fixed a typo in a variable name from baseTimeOut to baseTimeout, and updated error handling logic.
.../configs/baseTimeOut.js	Added a maxTime field with a value of 5000 to the baseTimeOut configuration.
.../hooks/useResourceData.js	Modified baseDelay and retryInterval calculation to include maxTime.
.../pages/employee/SetupCampaign.js	Added isSuccess property to uploadBoundary, uploadFacility, and uploadUser objects based on the length of filtered resources.

Poem

A bug we found in UploadData's name,
With baseTimeout, we correct the fame.
Max times are set and success now we see,
Campaigns upload smooth as can be.
🎉 Hail the fix, our code's delight,
In bytes and lines, we make it right! 💻🐰

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

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>.
  • Generate unit testing code for this file.
  • 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 generate unit testing code for this file.
  • @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 generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @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.

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 as 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 resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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: 1

Outside diff range and nitpick comments (13)

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useResourceData.js (3)

Line range hint 9-9: Consider renaming the Error variable to avoid shadowing the global Error object, which can lead to confusion and potential bugs.

- let Error = {
-   isError: false,
-   error: {},
- };
+ let apiError = {
+   isError: false,
+   error: {},
+ };

---

Line range hint 63-63: Convert this to use optional chaining to enhance code safety and readability.

- if (error?.response && error?.response?.data) {
+ if (error?.response?.data) {

---

Line range hint 70-74: The else clause here is unnecessary because the previous branches already return early. Removing it can simplify the code.

- } else {
-   Error = errorMessage;
-   Error.isError = true;
-   return Error;
- }

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (5)

Line range hint 103-103: Avoid using the delete operator as it can lead to performance issues. Instead, set the properties to undefined or refactor the code to not require deletion.

- delete newSchema.unique;
+ newSchema.unique = undefined;
- delete data.campaignType;
+ data.campaignType = undefined;

Also applies to: 169-169

---

Line range hint 337-344: These else clauses can be omitted as the previous branches already return early or break the flow, simplifying the code.

- else {
-   ...
- }

Also applies to: 448-450, 807-842, 813-841, 851-879

---

Line range hint 608-617: Declare variables at the root of the function to avoid confusion and potential hoisting issues.

- var validate = ajv.compile(translatedSchema[type]);
+ let validate;
+ validate = ajv.compile(translatedSchema[type]);

---

Line range hint 1138-1138: Avoid using the comma operator as it can obscure the code's intention and lead to errors.

- downloadTemplate(), setShowPopUp(false);
+ downloadTemplate();
+ setShowPopUp(false);

---

Line range hint 1109-1109: Ensure all JSX elements in iterables have a key prop to maintain proper re-rendering behavior.

- <React.Fragment key={type}>
+ <React.Fragment key={`type-${type}`}>
- {errorsType[type].split(",").map((error, index) => (
+ {errorsType[type].split(",").map((error, index) => <React.Fragment key={`error-${index}`}>
- {info?.descriptions.map((desc, i) => (
+ {info?.descriptions.map((desc, i) => <li key={`desc-${i}`} className="info-points">

Also applies to: 1122-1130, 1131-1140

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (5)

Line range hint 296-296: Consider simplifying the conditional expression here. If the goal is to negate the value, you can use the logical NOT (!) operator directly instead of a ternary operation.

- active: index === 0 ? false : true
+ active: !(index === 0)

---

Line range hint 358-358: There are several instances of unsafe usage of optional chaining in your code. If these expressions short-circuit to undefined, it could lead to a TypeError at runtime. Please ensure that the objects being accessed are guaranteed to exist or handle potential undefined values gracefully.

Also applies to: 359-359, 758-758, 900-903

---

Line range hint 559-752: There are multiple else clauses in your code that can be omitted because the preceding branches either return early or break the control flow, making the else unnecessary and potentially misleading.

- else {
-   // code here
- }

Also applies to: 917-919, 1007-1013, 1018-1021, 1028-1037

---

Line range hint 727-728: Using the delete operator can lead to performance issues due to changes in the underlying data structures of objects. Consider alternative ways to manage your object properties, perhaps by setting them to undefined or restructuring the object without the properties.

---

Line range hint 1023-1024: Declarations within switch cases can be accessed by other cases, which might lead to unexpected behaviors. Consider wrapping these declarations in a block scope to restrict their visibility to the respective cases.

case "example":
{
  let scopedVariable = value;
  // operations using scopedVariable
}
break;

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 4ac7d2a and c734fe0.

Files selected for processing (4)

• micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (6 hunks)
• micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/baseTimeOut.js (1 hunks)
• micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useResourceData.js (2 hunks)
• micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (1 hunks)

Additional context used

Path-based instructions (4)

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/baseTimeOut.js (1)

Pattern **/*.js: check

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useResourceData.js (1)

Pattern **/*.js: check

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (1)

Pattern **/*.js: check

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (1)

Pattern **/*.js: check

Learnings (2)

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (3)

User: siddhant-nawale-egov
PR: egovernments/DIGIT-Frontend#204
File: micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/pages/employee/Upload.js:468-481
Timestamp: 2024-03-13T07:33:45.211Z
Learning: The error message in the `checkForErrorInUploadedFile` function within `Upload.js` is being localized and improved for better user experience, as clarified by the user.

User: siddhant-nawale-egov
PR: egovernments/DIGIT-Frontend#204
File: micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/pages/employee/Upload.js:0-0
Timestamp: 2024-03-13T05:11:36.400Z
Learning: A more detailed message for file parsing errors in the `Upload.js` file is displayed elsewhere in the code, as clarified by the user.

User: siddhant-nawale-egov
PR: egovernments/DIGIT-Frontend#845
File: micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/components/Upload.js:460-461
Timestamp: 2024-06-12T08:18:44.708Z
Learning: Error handling for Shapefile parsing in `Upload.js` is managed commonly and is handled elsewhere in the codebase, as clarified by the user.

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (1)

User: siddhant-nawale-egov
PR: egovernments/DIGIT-Frontend#803
File: micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/components/Upload.js:300-341
Timestamp: 2024-06-06T06:12:01.804Z
Learning: If the `boundaryDataGeneration` function in `Upload.js` fails, it indicates that there is no data for that campaign, and this is an acceptable outcome. Retrying the operation is unnecessary as it would yield the same result.

Biome

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useResourceData.js

[error] 9-9: Do not shadow the global "Error" property. (lint/suspicious/noShadowRestrictedNames)

Consider renaming this variable. It's easy to confuse the origin of variables when they're named after a known global.

---

[error] 63-63: Change to an optional chain. (lint/complexity/useOptionalChain)

Unsafe fix: Change to an optional chain.

---

[error] 70-74: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js

[error] 103-103: Avoid the delete operator which can impact performance. (lint/performance/noDelete)

Unsafe fix: Use an undefined assignment instead.

---

[error] 152-152: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 169-169: Avoid the delete operator which can impact performance. (lint/performance/noDelete)

Unsafe fix: Use an undefined assignment instead.

---

[error] 337-344: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 448-450: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 608-617: This var should be declared at the root of the enclosing function. (lint/correctness/noInnerDeclarations)

The var is accessible in the whole body of the enclosing function.
To avoid confusion, it should be declared at the root of the enclosing function.

---

[error] 759-759: Change to an optional chain. (lint/complexity/useOptionalChain)

Unsafe fix: Change to an optional chain.

---

[error] 807-842: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 813-841: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 851-879: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 991-991: Change to an optional chain. (lint/complexity/useOptionalChain)

Unsafe fix: Change to an optional chain.

---

[error] 1138-1138: The comma operator is disallowed. (lint/style/noCommaOperator)

Its use is often confusing and obscures side effects.

---

[error] 1109-1109: Avoid passing children using a prop (lint/correctness/noChildrenProp)

The canonical way to pass children in React is to use JSX elements

---

[error] 1110-1110: Missing key property for this element in iterable. (lint/correctness/useJsxKeyInIterable)

The order of the items may change, and having a key can help React identify which item was moved.
Check the React documentation.

---

[error] 1122-1130: Missing key property for this element in iterable. (lint/correctness/useJsxKeyInIterable)

The order of the items may change, and having a key can help React identify which item was moved.
Check the React documentation.

---

[error] 1131-1140: Missing key property for this element in iterable. (lint/correctness/useJsxKeyInIterable)

The order of the items may change, and having a key can help React identify which item was moved.
Check the React documentation.

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js

[error] 296-296: Unnecessary use of boolean literals in conditional expression. (lint/complexity/noUselessTernary)

Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with

---

[error] 358-358: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 359-359: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 559-752: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 727-727: Avoid the delete operator which can impact performance. (lint/performance/noDelete)

---

[error] 728-728: Avoid the delete operator which can impact performance. (lint/performance/noDelete)

---

[error] 758-758: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 900-900: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 901-901: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 902-902: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 903-903: Unsafe usage of optional chaining. (lint/correctness/noUnsafeOptionalChaining)

If it short-circuits with 'undefined' the evaluation will throw TypeError here:

---

[error] 917-919: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 1007-1013: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 1010-1013: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

---

[error] 1018-1021: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 1023-1023: Other switch clauses can erroneously access this declaration.
Wrap the declaration in a block to restrict its access to the switch clause. (lint/correctness/noSwitchDeclarations)

The declaration is defined in this switch clause:

Unsafe fix: Wrap the declaration in a block.

---

[error] 1024-1024: Other switch clauses can erroneously access this declaration.
Wrap the declaration in a block to restrict its access to the switch clause. (lint/correctness/noSwitchDeclarations)

The declaration is defined in this switch clause:

Unsafe fix: Wrap the declaration in a block.

---

[error] 1028-1037: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Unsafe fix: Omit the else clause.

---

[error] 1031-1037: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

---

[error] 1034-1037: This else clause can be omitted because previous branches break early. (lint/style/noUselessElse)

Additional comments not posted (4)

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useResourceData.js (1)

80-82: The logic for calculating retryInterval using baseDelay and maxTime is correctly implemented. This should help in managing API call retries more efficiently.

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (2)

51-51: Corrected the variable name from baseTimeOut to baseTimeout to match the updated configuration. This change is crucial for maintaining consistency across the codebase.

---

Line range hint 152-152: Ensure the use of optional chaining is safe and does not lead to unexpected undefined values that could cause runtime errors.

Also applies to: 759-759, 991-991

micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js (1)

377-389: The addition of the isSuccess property is a good enhancement for providing immediate feedback on the success of uploads based on the presence of resources. This change aligns with the PR's objectives to enhance draft logic and provides a clearer, more immediate understanding of the state of data uploads.

[coderabbitai]

Tip

Codebase Verification

The references to baseTimeOut in useResourceData.js and UploadData.js do not appear to be updated to reflect the new structure with maxTime.

• useResourceData.js:

  • Line 80: const baseDelay = baseTimeOut?.baseTimeout?.[0]?.baseTimeOut;
  • Line 81: const maxTime = baseTimeOut?.baseTimeout?.[0]?.maxTime;

• UploadData.js:

  • Line 51: const { data: baseTimeOut } = Digit.Hooks.useCustomMDMS(tenantId, "HCM-ADMIN-CONSOLE", [{ name: "baseTimeout" }]);
  • Line 780: baseTimeOut?.["HCM-ADMIN-CONSOLE"]

These lines should be updated to use the correct structure introduced in the configuration update.

• Update the references in useResourceData.js and UploadData.js to use the new baseTimeOut structure.

Analysis chain

The configuration update looks correct. Ensure that all references to baseTimeOut in the codebase are updated to work with the new structure.

Scripts executed

The following scripts were executed for the analysis:

---

Script:

#!/bin/bash
# Description: Verify all references to `baseTimeOut` are correctly updated.

# Test: Search for the object usage. Expect: Only occurances of the new structure.
rg --type javascript $'baseTimeOut'

Length of output: 69

---

---

Script:

#!/bin/bash
# Description: Verify all references to `baseTimeOut` are correctly updated.

# Test: Search for the object usage. Expect: Only occurrences of the new structure.
rg --type js $'baseTimeOut'

Length of output: 1272

---

---

Script:

#!/bin/bash
# Description: Verify specific lines in `useResourceData.js` and `UploadData.js` for correct usage of the new `baseTimeOut` structure.

# Check the specific lines in `useResourceData.js`
rg --line-number --context 2 'baseTimeOut' micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useResourceData.js

# Check the specific lines in `UploadData.js`
rg --line-number --context 2 'baseTimeOut' micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js

Length of output: 1289