Files that changed from the base of the PR and between 7207a4d and db064e2.

• apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts (6 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyForm.tsx (2 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyModal.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SortOption.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCard.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCopyOptions.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropdownMenu.tsx (5 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilterDropdown.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilters.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx (5 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/lib/surveys.ts (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/loading.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/types/survey.ts (1 hunks)
• packages/lib/localStorage.ts (0 hunks)
• packages/lib/survey/service.ts (0 hunks)
• packages/ui/components/SurveysList/components/SurveyCard.tsx (0 hunks)

• packages/lib/localStorage.ts
• packages/lib/survey/service.ts
• packages/ui/components/SurveysList/components/SurveyCard.tsx

apps/web/app/(app)/environments/[environmentId]/surveys/types/survey.ts (3)

1-2: LGTM: Imports are appropriate and well-structured.

The imports are correctly defined and align with the file's purpose. The zod library is imported for schema definition, and ZSurveyStatus is imported from a custom types file, which is good for maintaining consistency across the project.

---

26-26: LGTM: Type export is correctly defined.

The TSurveyListItem type is correctly inferred from the ZSurveyListItem schema using z.infer. This approach ensures type consistency between the schema and the TypeScript type, which is a best practice when using Zod with TypeScript.

---

1-26: Overall assessment: Well-implemented schema and type definition for survey list items.

This new file introduces a robust Zod schema (ZSurveyListItem) and corresponding TypeScript type (TSurveyListItem) for survey list items. The implementation is clean, well-structured, and follows good practices for type safety and data validation.

Key strengths:

1. Comprehensive schema definition covering various aspects of a survey list item.
2. Proper use of Zod for schema validation and TypeScript type inference.
3. Flexibility in handling nullable fields like 'creator' and 'singleUse'.

Areas for potential improvement:

1. Consider adding more specific constraints to some fields for tighter validation.
2. Plan for the future refactoring of the 'type' field as mentioned in the comment.

These changes align well with the PR objectives of implementing custom data fetching for the surveys table, providing a solid foundation for type-safe operations on survey data throughout the application.

apps/web/app/(app)/environments/[environmentId]/surveys/loading.tsx (1)

1-1: Approve import path change, but verify consistency.

The updated import path for the SurveyLoading component reflects a change in the project structure, which could improve organization. However, it's crucial to ensure this change is applied consistently across the entire project.

Please run the following script to verify the consistency of this import change:

Consider updating the project documentation to reflect this structural change if it represents a significant shift in component organization.

✅ Verification successful

Import path change verified successfully

The updated import path for the SurveyLoading component is consistently applied across the codebase. No remaining instances of the old import path were found.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any remaining old import paths and new import paths for SurveyLoading

echo "Checking for old import paths:"
rg --type typescript --type tsx "from\s+['\"]@formbricks/ui/components/SurveysList/components/SurveyLoading['\"]"

echo "Checking for new import paths:"
rg --type typescript --type tsx "from\s+['\"]@/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyLoading['\"]"

Length of output: 466

---

Script:

#!/bin/bash
# Description: Check for any remaining old import paths and new import paths for SurveyLoading with corrected file types

echo "Checking for old import paths:"
rg --type ts --type tsx "from\s+['\"]@formbricks/ui/components/SurveysList/components/SurveyLoading['\"]"

echo "Checking for new import paths:"
rg --type ts --type tsx "from\s+['\"]@/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyLoading['\"]"

Length of output: 436

---

Script:

#!/bin/bash
# Description: Check for any remaining old import paths and new import paths for SurveyLoading using file extensions

echo "Checking for old import paths:"
rg "from\s+['\"]@formbricks/ui/components/SurveysList/components/SurveyLoading['\"]" --glob "*.ts" --glob "*.tsx"

echo "Checking for new import paths:"
rg "from\s+['\"]@/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyLoading['\"]" --glob "*.ts" --glob "*.tsx"

Length of output: 571

apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyModal.tsx (4)

1-1: Improved imports for better modularity and type consistency.

The changes in the import statements are beneficial:

1. Importing TSurveyListItem type ensures consistency with the new data structure for surveys.
2. Importing Modal from @formbricks/ui promotes the use of a shared UI component library, enhancing consistency and maintainability across the project.

These changes align well with best practices for modular and maintainable code.

Also applies to: 3-3

---

Line range hint 1-37: Summary: Improved type safety and modularity with potential compatibility concerns.

The changes to CopySurveyModal.tsx enhance type safety and modularity through:

1. Updated imports for better consistency with the project structure.
2. A more specific type (TSurveyListItem) for the survey prop.

These improvements are commendable. However, to ensure these changes don't introduce issues:

1. Verify that all uses of the survey prop within this component and its children (especially SurveyCopyOptions) are compatible with the new TSurveyListItem type.
2. Confirm that SurveyCopyOptions component is updated to work with TSurveyListItem.
3. Ensure no critical data is lost in the transition from TSurvey to TSurveyListItem.

After addressing these points, the changes will significantly contribute to the maintainability and type safety of the codebase.

---

Line range hint 13-37: Verify SurveyCopyOptions compatibility with TSurveyListItem.

The component structure remains unchanged, which is good for maintaining consistency. However, it's crucial to ensure that the SurveyCopyOptions component is compatible with the new TSurveyListItem type.

Please verify:

1. That the SurveyCopyOptions component's props are updated to accept TSurveyListItem instead of TSurvey.
2. That all uses of the survey prop within SurveyCopyOptions are compatible with TSurveyListItem.

Run the following script to check the SurveyCopyOptions component:

#!/bin/bash
# Description: Check SurveyCopyOptions component for compatibility with TSurveyListItem

# Test: Check SurveyCopyOptions props
ast-grep --lang typescript --pattern 'interface $_Props {
  $$$
  survey: $_
  $$$
}' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyCopyOptions.tsx

# Test: Look for uses of survey prop that might be incompatible with TSurveyListItem
ast-grep --lang typescript --pattern '$_.$prop' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyCopyOptions.tsx | grep -v -E '(id|name|environmentId)'

Review the results to ensure SurveyCopyOptions is fully compatible with the new TSurveyListItem type.

---

9-9: Verify internal usage of the updated survey prop type.

The change from TSurvey to TSurveyListItem for the survey prop is consistent with the updated import. This suggests a shift to using a more specific data structure for surveys in list contexts.

To ensure this change doesn't introduce any issues, please verify:

1. That all uses of the survey prop within this component and its children are compatible with the TSurveyListItem type.
2. That no required fields from the previous TSurvey type are missing in TSurveyListItem.

Run the following script to check for potential issues:

If the script returns results, please review them to ensure compatibility with the new TSurveyListItem type.

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCopyOptions.tsx (3)

1-2: LGTM! Verify the new import paths.

The import statements have been updated to reflect changes in the project structure. The addition of TSurveyListItem import aligns with the updated prop type.

Run the following script to verify the import paths:

#!/bin/bash
# Description: Verify the existence of the imported files and their exports.

# Test 1: Check if the file containing getProductsByEnvironmentIdAction exists
fd --type f --full-path ".*environments/\[environmentId\]/surveys/actions.(ts|tsx|js|jsx)$" --exec grep -q "export.*getProductsByEnvironmentIdAction" {} \; && echo "getProductsByEnvironmentIdAction import path is valid" || echo "getProductsByEnvironmentIdAction import path may be incorrect"

# Test 2: Check if the file containing TSurveyListItem exists
fd --type f --full-path ".*environments/\[environmentId\]/surveys/types/survey.(ts|tsx|js|jsx)$" --exec grep -q "export.*TSurveyListItem" {} \; && echo "TSurveyListItem import path is valid" || echo "TSurveyListItem import path may be incorrect"

---

11-11: LGTM! Ensure consistency of TSurveyListItem usage.

The survey prop type has been updated from TSurvey to TSurveyListItem, which aligns with the new import. This change suggests a modification in the structure of survey data being passed to the component.

Run the following script to verify the consistent usage of TSurveyListItem:

#!/bin/bash
# Description: Check for consistent usage of TSurveyListItem across the codebase.

# Test 1: Find all occurrences of TSurveyListItem
echo "Occurrences of TSurveyListItem:"
rg --type typescript --type tsx "TSurveyListItem"

# Test 2: Check for any remaining usage of TSurvey that might need updating
echo "Potential instances of TSurvey that might need updating:"
rg --type typescript --type tsx "TSurvey(?!ListItem)"

---

Line range hint 1-50: Summary: Changes look good, verify integration with related components.

The changes to SurveyCopyOptions.tsx primarily involve updates to type definitions and import paths. The core functionality of the component remains intact. These modifications appear to be part of a broader refactoring effort to enhance type safety and improve project structure.

To ensure these changes integrate well with the rest of the application, consider running the following verification steps:

1. Compile the entire project to check for any type-related errors.
2. Run the application and navigate to the surveys page to verify that the SurveyCopyOptions component renders correctly.
3. Test the survey copying functionality to ensure it still works as expected with the updated types.

✅ Verification successful

Action Required: Re-run Verification Scripts with Corrected Commands

Please execute the following corrected shell scripts to gather the necessary information for verification:

---

Verification Complete: No Issues Found

The import paths for SurveyCopyOptions.tsx and TSurveyListItem are valid and correctly integrated within the codebase. No discrepancies or issues were identified in the verification process.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the integration of SurveyCopyOptions with related components.

# Test 1: Find components that use SurveyCopyOptions
echo "Components using SurveyCopyOptions:"
rg --type typescript --type tsx "import.*SurveyCopyOptions|from ['\"].*SurveyCopyOptions['\"]"

# Test 2: Check for any usage of TSurvey type that might need updating to TSurveyListItem
echo "Potential usage of TSurvey type that might need updating:"
rg --type typescript --type tsx "TSurvey(?!ListItem)"

Length of output: 951

---

Script:

#!/bin/bash
# Description: Verify the integration of SurveyCopyOptions with related components after correcting previous script errors.

# Test 1: Find components that use SurveyCopyOptions
echo "Components using SurveyCopyOptions:"
rg --pcre2 -g "*.ts" -g "*.tsx" "import.*SurveyCopyOptions|from ['\"].*SurveyCopyOptions['\"]"

# Test 2: Check for any usage of TSurvey type that might need updating to TSurveyListItem
echo "Potential usage of TSurvey type that might need updating to TSurveyListItem:"
rg --pcre2 -g "*.ts" -g "*.tsx" "TSurvey(?!ListItem)"

Length of output: 214461

---

Script:

#!/bin/bash
# Description: Verify the import paths for TSurveyListItem.

fd --type f --full-path ".*environments/\[environmentId\]/surveys/types/survey\.(ts|tsx|js|jsx)$" --exec grep -q "export.*TSurveyListItem" {} \; && echo "TSurveyListItem import path is valid" || echo "TSurveyListItem import path may be incorrect"

Length of output: 232

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilterDropdown.tsx (2)

3-9: Improved import structure for UI components

The changes to the import statements are a positive improvement:

1. Centralizing UI component imports from @formbricks/ui/components enhances maintainability and consistency across the application.
2. This approach makes it easier to manage and update UI components globally.
3. The standardization aligns with best practices for organizing a component library.

These changes do not affect the component's functionality and structure, making this a low-risk, high-value improvement.

---

Line range hint 11-71: Component functionality preserved with new imports

I've reviewed the rest of the SurveyFilterDropdown component, and I can confirm:

1. The component's logic and structure remain unchanged.
2. The imported UI components are used correctly throughout the component.
3. The props interface and component functionality are preserved.

This indicates that the import changes have been successfully integrated without affecting the component's behavior. The component should continue to function as expected with the new centralized UI component imports.

apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx (2)

Line range hint 2-89: LGTM: Rest of the file is consistent with the import change

The usage of the SurveysList component in the rest of the file remains consistent with the previous implementation. The props passed to the component are unchanged, which suggests that the interface of the relocated SurveysList component has been maintained.

No other parts of the file appear to be affected by the import change, indicating that the relocation was likely a straightforward move without requiring additional modifications to the component's usage or surrounding code.

---

1-1: Verify the relocation of SurveysList component

The import statement for the SurveysList component has been updated to a more specific path within the app structure. This change could indicate a move towards environment-specific implementations of the SurveysList.

While this change may provide more flexibility for customization, it's important to consider the following:

1. Ensure that the new SurveysList component maintains the same interface as the previous one to avoid breaking changes in this file.
2. Consider the implications for reusability across different parts of the application. If this component is used elsewhere, those imports may need to be updated as well.
3. Evaluate if this change aligns with the project's overall architecture and component organization strategy.

To ensure consistency across the codebase, run the following script to check for other usages of the SurveysList component:

This will help identify any other files that may need to be updated due to this change.

✅ Verification successful

Relocation of SurveysList Component Verified

The SurveysList component has been successfully relocated to a more specific path within page.tsx. No other imports of SurveysList were found in the codebase, ensuring that this change does not affect other parts of the application.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for other imports of SurveysList
rg --type typescript --type tsx 'import.*SurveysList.*from' -g '!**/page.tsx'

Length of output: 114

---

Script:

#!/bin/bash
# Search for other imports of SurveysList in TypeScript and TSX files, excluding page.tsx
rg --type ts --type tsx 'import\s+.*SurveysList\s+from' -g '!**/page.tsx'

Length of output: 103

---

Script:

#!/bin/bash
# Search for other imports of SurveysList in TypeScript and TSX files, excluding page.tsx
rg 'import\s+.*SurveysList\s+from' -g '*.ts' -g '*.tsx' -g '!**/page.tsx'

Length of output: 75

apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts (1)

Line range hint 24-33: LGTM! Verify client-side usage of the updated function.

The renaming of getSurveyAction to getSurveyListItemAction and the use of getSurveyListItem are consistent with the import changes. The authorization check is correctly maintained.

Please ensure that all client-side code calling this function has been updated to handle the new data structure (survey list item instead of full survey). Run the following script to check for any remaining usage of the old function name:

✅ Verification successful

Adjust the search command to correctly target TypeScript files:

---

No remaining usages of getSurveyAction found.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any remaining usage of getSurveyAction
rg 'getSurveyAction' --type typescript --type tsx

Length of output: 84

---

Script:

# Search for any remaining usage of getSurveyAction in .ts and .tsx files
rg 'getSurveyAction' -g '*.ts' -g '*.tsx'

Length of output: 41

apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyForm.tsx (3)

Line range hint 22-159: Approve unchanged logic with testing recommendation.

The core functionality and structure of the component remain largely unchanged, which is good for maintaining consistency. However, given the changes in imports and types, it's crucial to ensure that the existing functionality still works as expected.

Please perform a comprehensive test of the CopySurveyForm component to verify that:

1. The form renders correctly with the new imports.
2. The checkbox functionality for selecting environments works as expected.
3. The form submission process, including the onSubmit function, operates correctly with the new TSurveyListItem type.
4. The copySurveyToOtherEnvironmentAction is called with the correct parameters.
5. Error handling and success messages are displayed appropriately.

Consider adding or updating unit tests to cover these scenarios if they don't already exist.

---

Line range hint 1-159: Overall assessment: Positive changes with verification needed.

The changes to the CopySurveyForm component, primarily focusing on updating imports and types, appear to be part of a larger refactoring effort to improve modularity and type safety. These modifications are generally positive and should enhance the maintainability of the codebase.

Key points:

1. The shift to using "@formbricks/ui/components" suggests an improved component library structure.
2. The change from TSurvey to TSurveyListItem indicates a refinement in the data structure being used.
3. The core functionality of the component remains intact, which is good for maintaining consistency.

Recommendations:

1. Verify that all instances of TSurvey that should now be TSurveyListItem have been updated throughout the codebase.
2. Conduct thorough testing of the CopySurveyForm component to ensure it functions correctly with the new imports and types.
3. Consider updating or adding unit tests to cover the component's functionality, especially focusing on areas affected by the type changes.
4. Review the larger refactoring effort to ensure consistency across all affected components and files.

Please confirm that these changes are part of a coordinated refactoring effort and that all necessary updates have been made across the codebase to support these changes.

---

21-21: Approve type change with verification request.

The change from TSurvey to TSurveyListItem for the survey prop is noted. This suggests a shift in the expected structure of the survey data being passed to the component.

Please verify that this type change is consistent with how the component is used throughout the application. Run the following script to check for any potential issues:

Ensure that all occurrences of TSurvey that should now be TSurveyListItem have been updated accordingly.

✅ Verification successful

Approve type change with .

The change from TSurvey to TSurveyListItem for the survey prop in CopySurveyForm.tsx has been verified and does not impact other parts of the codebase.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for potential issues with TSurveyListItem usage

# Test: Search for TSurveyListItem usage
echo "Searching for TSurveyListItem usage:"
rg --type typescript "TSurveyListItem"

# Test: Search for potential mismatches between TSurvey and TSurveyListItem
echo "Searching for potential mismatches:"
rg --type typescript "TSurvey(?!ListItem)"

Length of output: 512

---

Script:

#!/bin/bash
# Description: Check for potential issues with TSurveyListItem usage

# Test: Search for TSurveyListItem usage
echo "Searching for TSurveyListItem usage:"
rg "TSurveyListItem" --glob "*.{ts,tsx}"

# Test: Search for potential mismatches between TSurvey and TSurveyListItem using PCRE2
echo "Searching for potential mismatches:"
rg --pcre2 "TSurvey(?!ListItem)" --glob "*.{ts,tsx}"

Length of output: 217186

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCard.tsx (1)

123-123: Verify the necessity of calling .toString() on date fields

The .toString() calls on survey.createdAt and survey.updatedAt may be unnecessary if these fields are already strings or acceptable formats for convertDateString and timeSince functions. Removing .toString() could simplify the code.

Also applies to: 126-126

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx (3)

125-127: Ensure handleDuplicateSurvey works with TSurveyListItem

The handleDuplicateSurvey function now accepts a parameter of type TSurveyListItem. Confirm that the duplication logic is appropriate for this type and that all necessary properties are correctly handled when updating the surveys state.

---

149-163: Verify that SurveyCard accepts updated survey type

Ensure that the SurveyCard component is updated to accept survey of type TSurveyListItem. This includes verifying that all required properties used within SurveyCard are present in TSurveyListItem.

---

44-44: Verify compatibility of TSurveyListItem with existing usage

The state surveys has been updated to use TSurveyListItem[] instead of TSurvey[]. Ensure that all usages of surveys within this component and any child components, such as SurveyCard, are compatible with TSurveyListItem. This includes verifying that all required properties are accessible and that no type errors will occur.

To verify, you can search for all references to surveys and check for type compatibility:

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilters.tsx (1)

8-14: Good use of shared UI components for modularity

Importing Button, DropdownMenu, and SearchBar from @formbricks/ui/components improves code modularity and promotes reusability across the application.

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropdownMenu.tsx (7)

3-7: Imports updated to reflect new action functions

The imports have been correctly updated to include copySurveyToOtherEnvironmentAction, deleteSurveyAction, and getSurveyListItemAction, replacing getSurveyAction. This ensures the component uses the latest action functions.

---

8-8: Updated type import to TSurveyListItem

The import statement now includes TSurveyListItem, aligning with the updated data structure for surveys. This change ensures type consistency within the component.

---

29-29: Prop type for survey updated to TSurveyListItem

The survey prop in SurveyDropDownMenuProps interface has been updated from TSurvey to TSurveyListItem. Verify that all usages of survey within the component are compatible with TSurveyListItem and that no required properties are missing.

---

35-35: Updated duplicateSurvey function signature

The duplicateSurvey function now accepts a TSurveyListItem instead of TSurvey. Ensure that this change is reflected wherever duplicateSurvey is implemented and that it functions correctly with the new type.

---

56-60: Simplified handleDeleteSurvey function parameter

The handleDeleteSurvey function now accepts a surveyId string directly instead of a survey object. This simplifies the function and makes it more focused on the unique identifier needed for deletion.

---

Line range hint 81-85: Updated duplication logic to use getSurveyListItemAction

The duplication process now uses getSurveyListItemAction, ensuring that the duplicated survey data aligns with the expected TSurveyListItem type. This update maintains consistency in how survey data is handled post-duplication.

---

213-213: Correct onDelete handler in DeleteDialog

The onDelete prop now correctly passes survey.id to handleDeleteSurvey, matching the updated function signature that expects a surveyId.

Files that changed from the base of the PR and between db064e2 and 3a978b3.

• apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts (2 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyForm.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyModal.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SortOption.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCard.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCopyOptions.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropdownMenu.tsx (4 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilterDropdown.tsx (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilters.tsx (2 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx (2 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/lib/surveys.ts (1 hunks)
• apps/web/app/(app)/environments/[environmentId]/surveys/types/surveys.ts (1 hunks)
• packages/js/src/index.ts (0 hunks)
• packages/types/surveys/types.ts (0 hunks)

• packages/js/src/index.ts
• packages/types/surveys/types.ts

• apps/web/app/(app)/environments/[environmentId]/surveys/actions.ts
• apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyForm.tsx
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SortOption.tsx
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCopyOptions.tsx
• apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilterDropdown.tsx

apps/web/app/(app)/environments/[environmentId]/surveys/types/surveys.ts (4)

1-2: LGTM: Imports are correct and necessary.

The imports for Zod and the pre-defined survey status type are appropriate for the file's purpose.

---

26-26: LGTM: Correct type alias definition.

The TSurvey type alias is correctly defined using Zod's infer utility, which is a best practice when working with Zod schemas.

---

28-35: LGTM: Well-defined schema for survey copy form validation.

The ZSurveyCopyFormValidation schema is correctly structured to validate survey copy operations across multiple products and environments. It provides a clear definition of the expected data structure for this operation.

---

37-37: LGTM: Correct type alias for survey copy form data.

The TSurveyCopyFormData type alias is properly defined using Zod's infer utility, consistent with the approach used for TSurvey.

apps/web/app/(app)/environments/[environmentId]/surveys/components/CopySurveyModal.tsx (1)

5-5: LGTM: Import statement updated for better modularity.

The change from a relative import to an absolute import from the @formbricks/ui package for the Modal component is a good practice. It enhances modularity and makes the code more maintainable.

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyCard.tsx (3)

1-24: LGTM: Imports and component interface are well-structured

The "use client" directive, import statements, and SurveyCardProps interface are correctly implemented and provide a solid foundation for the component.

---

1-141: Overall assessment: Well-implemented component with room for minor improvements

The SurveyCard component is well-structured and effectively uses React hooks for state management and memoization. It provides a comprehensive display of survey information and interactions.

Key strengths:

1. Proper use of "use client" directive for client-side rendering.
2. Well-defined props interface.
3. Effective use of useMemo for computed values.
4. Good error handling in the singleUseId fetching logic.

Areas for improvement:

1. Moving the SurveyTypeIndicator to a separate file for better organization.
2. Restructuring the layout to place the SurveyDropDownMenu outside the Link component for improved accessibility.
3. Simplifying some expressions and removing redundant variables.
4. Adding a default case in the survey status label computation.

Implementing the suggested changes will further enhance the component's readability, maintainability, and accessibility.

🧰 Tools

🪛 Biome

[error] 51-51: Unnecessary use of boolean literals in conditional expression.

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

(lint/complexity/noUselessTernary)

---

36-42: ⚠️ Potential issue

Add a default case to handle unexpected survey statuses

The surveyStatusLabel computation doesn't handle unexpected or new statuses, which could lead to undefined labels. Consider adding a default case to ensure all possible statuses are covered.

Apply this diff to add a default case:

  const surveyStatusLabel = useMemo(() => {
    if (survey.status === "inProgress") return "In Progress";
    else if (survey.status === "scheduled") return "Scheduled";
    else if (survey.status === "completed") return "Completed";
    else if (survey.status === "draft") return "Draft";
    else if (survey.status === "paused") return "Paused";
+   else return "Unknown Status";
  }, [survey]);

Likely invalid or redundant comment.

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyList.tsx (6)

Line range hint 88-126: Approve updated data fetching logic and suggest pagination testing

The new data fetching logic using getSurveysAction and incorporating filters is well-implemented. The pagination mechanism has been successfully adapted to work with the new filtering system.

To ensure the pagination works correctly with various filter combinations, consider adding the following test cases:

1. Fetch surveys with no filters applied
2. Fetch surveys with a single filter (e.g., by name)
3. Fetch surveys with multiple filters
4. Test pagination by loading more surveys with different filter combinations

You may want to create a separate test file or add these scenarios to your existing test suite.

---

Line range hint 128-131: Verify survey duplication logic with TSurveyFilters

The handleDuplicateSurvey function signature has been updated to use TSurveyFilters instead of TSurvey. While this is consistent with earlier type changes, it's important to ensure that the duplication logic itself has been updated to handle the new type correctly.

Please review the implementation of the survey duplication functionality (which might be in a separate file) to confirm that it properly handles the TSurveyFilters type. If necessary, update the duplication logic to work with the new type.

---

Line range hint 1-190: Summary of SurveyList.tsx changes

Overall, the changes to the SurveyList component enhance its functionality by introducing better filtering capabilities and a more comprehensive survey display. Here are the key points to address:

1. Verify type consistency between TSurvey and TSurveyFilters throughout the component.
2. Run a thorough type-check to ensure no type-related errors were introduced.
3. Consider adding test cases for pagination with various filter combinations.
4. Fix the grid column mismatch in the survey card layout.
5. Review and update the survey duplication logic to ensure it works correctly with the new TSurveyFilters type.

After addressing these points, the component should be well-structured and fully functional with its new features.

---

139-163: ⚠️ Potential issue

Fix grid column mismatch

The grid layout for survey cards has been updated to include more information, which is an improvement. However, there's a mismatch between the number of grid columns and header items.

To fix this, apply the following change:

-<div className="mt-6 grid w-full grid-cols-8 place-items-center gap-3 px-6 text-sm text-slate-800">
+<div className="mt-6 grid w-full grid-cols-7 place-items-center gap-3 px-6 text-sm text-slate-800">

This will align the grid columns with the number of header items, ensuring proper layout.

---

Line range hint 39-86: Approve filter-related changes and suggest type verification

The addition of filter-related state and effects enhances the component's functionality. The change in the surveys state type from TSurvey[] to TSurveyFilters[] is noted.

To ensure type consistency throughout the component, run the following type-check:

#!/bin/bash
# Description: Perform a type-check on the SurveyList component

# Test: Run TypeScript compiler in noEmit mode
echo "Running TypeScript type-check:"
npx tsc --noEmit apps/web/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyList.tsx

---

3-15: Verify type consistency between TSurvey and TSurveyFilters

The import of both TSurvey and TSurveyFilters suggests a potential type inconsistency. Ensure that these types are used correctly throughout the component, especially in state declarations and function parameters.

To verify the type usage, run the following script:

✅ Verification successful

Types TSurvey and TSurveyFilters are used consistently

The imports and usage of both TSurvey and TSurveyFilters in SurveyList.tsx are consistent. Each type is utilized appropriately in state declarations and function parameters without any overlap or inconsistency.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check the usage of TSurvey and TSurveyFilters types

# Test: Search for TSurvey and TSurveyFilters usage
echo "Searching for TSurvey usage:"
rg --type typescript 'TSurvey(?!Filters)' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/
echo "\nSearching for TSurveyFilters usage:"
rg --type typescript 'TSurveyFilters' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/

Length of output: 550

---

Script:

#!/bin/bash
# Description: Check the usage of TSurvey and TSurveyFilters types without specifying file type

# Searching for TSurvey usage excluding TSurveyFilters
echo "Searching for TSurvey usage (excluding TSurveyFilters):"
rg 'TSurvey(?!Filters)' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/ -A2

# Searching for TSurveyFilters usage
echo "\nSearching for TSurveyFilters usage:"
rg 'TSurveyFilters' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/ -A2

Length of output: 4012

---

Script:

#!/bin/bash
# Description: Check the usage of TSurvey and TSurveyFilters types without using unsupported regex

# Searching for TSurvey usage
echo "Searching for TSurvey usage:"
rg 'TSurvey\b' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/ -A2

# Searching for TSurveyFilters usage
echo "\nSearching for TSurveyFilters usage:"
rg 'TSurveyFilters\b' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/ -A2

Length of output: 43234

---

Script:

#!/bin/bash
# Description: Extract usage of TSurvey and TSurveyFilters in SurveyList.tsx

# Extract lines with TSurvey
echo "Extracting TSurvey usages in SurveyList.tsx:"
rg 'TSurvey\b' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyList.tsx -A2

# Extract lines with TSurveyFilters
echo "\nExtracting TSurveyFilters usages in SurveyList.tsx:"
rg 'TSurveyFilters\b' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/components/SurveyList.tsx -A2

Length of output: 1390

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyFilters.tsx (4)

1-16: LGTM: Import statements have been improved

The changes to the import statements look good. The shift to using shared UI components from @formbricks/ui/components enhances maintainability and consistency across the project. The addition of the "use client" directive is correct for a Client Component in Next.js.

Note: The previous suggestion to move SortOption and initialFilters to the shared UI library has been partially addressed. Consider if SortOption could also be moved to the shared library in the future for further consistency.

---

70-73: LGTM: typeOptions moved inside component

Moving the typeOptions array inside the component is acceptable. This change localizes the options to where they are used, which is fine if they're not needed elsewhere in the application.

---

Line range hint 1-190: Verify impact of removing orientation functionality

The removal of all orientation-related state management and UI elements significantly simplifies the component, which is good for maintainability. This change is consistent with the updates to the SurveyFilterProps interface and aligns with the PR objectives.

Please verify that the removal of orientation functionality doesn't negatively impact any user-facing features or other components that might have depended on this functionality. Consider running the following script to check for any remaining references to orientation in related files:

#!/bin/bash
# Description: Check for any remaining references to orientation in survey-related files

# Test: Search for orientation references in survey-related files
rg --type typescript --type tsx 'orientation' apps/web/app/\(app\)/environments/\[environmentId\]/surveys/

---

Line range hint 19-23: LGTM: SurveyFilterProps interface simplified

The removal of orientation and setOrientation props from the SurveyFilterProps interface simplifies the component's API, which is good. This change is consistent with the removal of orientation-related functionality.

Please verify that all components using SurveyFilters have been updated to remove the orientation and setOrientation props. Run the following script to check for any remaining usage:

✅ Verification successful

Please run the following script to verify any remaining usage of orientation props in SurveyFilters:

---

Please run the following script to verify any remaining usage of orientation props in SurveyFilters:

---

Verified: orientation props successfully removed from SurveyFilters

The orientation and setOrientation props have been fully removed from the SurveyFilters interface, and no remaining usages were found in the codebase.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any remaining usage of orientation props in SurveyFilters

# Test: Search for SurveyFilters usage with orientation props
rg --type typescript --type tsx 'SurveyFilters.*orientation'

Length of output: 139

---

Script:

#!/bin/bash
# Description: Re-check for any remaining usage of orientation props in SurveyFilters with corrected file types

# Test: Search for SurveyFilters usage with orientation props using correct file type identifiers
rg --type ts --type tsx 'SurveyFilters.*orientation'

Length of output: 82

---

Script:

#!/bin/bash
# Description: Search for any remaining usage of orientation props in SurveyFilters within .ts and .tsx files

# Test: Search for SurveyFilters usage with orientation props using glob patterns for file extensions
rg --glob "*.ts" --glob "*.tsx" 'SurveyFilters\..*orientation'

Length of output: 64

apps/web/app/(app)/environments/[environmentId]/surveys/lib/surveys.ts (1)

1-34: LGTM: Imports and surveySelect object are well-defined

The imports cover all necessary modules and types for the file's functionality. The surveySelect object is comprehensive, including all relevant fields for survey data retrieval, which will ensure consistent data selection across different query operations.

apps/web/app/(app)/environments/[environmentId]/surveys/components/SurveyDropdownMenu.tsx (3)

17-17: LGTM! Improved import syntax.

The change to use named import syntax for DeleteDialog improves code consistency and clarity.

---

18-24: LGTM! Consistent import syntax improvement.

The change to use named import syntax for DropdownMenu components is consistent with the previous import changes and improves code readability.

---

213-213: LGTM! Consistent with function signature change.

The update to pass survey.id directly to handleDeleteSurvey is consistent with the earlier changes and improves code clarity.