[pull] main from calcom:main #971
Merged
+535
−159
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…` to `features` (#26025) * mv * wip * wip * wip * wip * plural * fix: resolve TypeScript type errors for attribute refactoring - Add TransformedAttributeOption type to handle transformed contains field - Update imports to use routing-forms Attribute type where needed - Fix getValueOfAttributeOption to use TransformedAttributeOption type - Update AttributeOptionValueWithType to use TransformedAttributeOption - Fix pre-existing lint warnings (any -> unknown, proper type casting) Co-Authored-By: [email protected] <[email protected]> * fix * cleanup * cleanup * fix * fix * fix * fix * fix * fix: add explicit type annotation to reduce callback in getAttributes.ts Co-Authored-By: [email protected] <[email protected]> * fix: use RouterOutputs from @calcom/trpc/react for consistent type inference - Update AppPage.tsx to use RouterOutputs from @calcom/trpc/react instead of inferRouterOutputs<AppRouter> - Update MultiDisconnectIntegration.tsx to use the same RouterOutputs type source - Add eslint-disable comments for pre-existing warnings (useEffect deps, img elements) Co-Authored-By: [email protected] <[email protected]> * fix: explicitly type attribute property in AttributeOptionAssignment The attribute property from Pick<AttributeOption, 'attribute'> was typed as 'unknown' because Prisma relations don't have explicit types when picked. This explicitly defines the attribute shape with id, type, and isLocked properties that are used in assignValueToUser.ts. Co-Authored-By: [email protected] <[email protected]> * fix: remove unused assignedUsers from AttributeOptionAssignment Pick The assignedUsers property was not being used in the code but was required by the Pick type, causing a type mismatch when the actual data from the database query didn't include it. Co-Authored-By: [email protected] <[email protected]> * fix: update import path for AttributeOptionAssignment and BulkAttributeAssigner types The types.d.ts file was moved from packages/lib/service/attribute/ to packages/app-store/routing-forms/types/. Updated the import path in utils.ts to point to the new location. Co-Authored-By: [email protected] <[email protected]> * fix --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…ache (#26276) * fix: align env vars between Production Builds and E2E workflows for turbo cache sharing Co-Authored-By: [email protected] <[email protected]> * fix: move E2E-specific env vars to step-level for turbo cache alignment Instead of adding env vars to production-build-without-database.yml (which caused DB calls during build), move the E2E-specific env vars from workflow-level to step-level in e2e.yml. This ensures the cache-build step has the same env context in both workflows, enabling turbo remote cache sharing. Env vars moved to step-level: - DATABASE_DIRECT_URL (to cache-db and Run Tests steps) - E2E_TEST_MAILHOG_ENABLED (to Run Tests step) - EMAIL_SERVER_* (to Run Tests step) Co-Authored-By: [email protected] <[email protected]> * fix: restore production build cache with stable key using actions/cache - Restore artifact caching for .next, dist, and .turbo directories - Use actions/cache@v4 (accelerated by Blacksmith on their runners) - Design stable cache key scoped to branch: - Includes branch name (head_ref for PRs, ref_name for pushes) - Hashes yarn.lock for dependency changes - Hashes source files in apps/web and packages/*/src - Excludes generated directories (prisma/zod, kysely) that caused instability - Add restore-keys for partial cache hits - Only run yarn build on cache miss - Revert e2e.yml env var changes (no longer needed with artifact caching) Co-Authored-By: [email protected] <[email protected]> * fix: simplify restore-keys to single fallback Co-Authored-By: [email protected] <[email protected]> * fix: remove restore-keys entirely for exact cache matching only Co-Authored-By: [email protected] <[email protected]> * fix: use broader package pattern with exclusions for generated prisma files Co-Authored-By: [email protected] <[email protected]> * fix: add exclusions for prisma/generated and prisma/client directories Co-Authored-By: [email protected] <[email protected]> * Apply suggestion from @cubic-dev-ai[bot] Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> * fix: add .json and .css patterns to cache hash for config and style changes Co-Authored-By: [email protected] <[email protected]> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
This change adds a trust-check job that gates CI for external contributors: - Trusted contributors (OWNER, MEMBER, COLLABORATOR) can run CI immediately - External contributors require approval from a core team member (write access or higher) - Approval must be for the current commit SHA (stale approvals are ignored) - Added pull_request_review trigger so CI runs when approval is given - The required job now fails with a clear message for untrusted PRs Co-authored-By: Volnei Munhoz <[email protected]> Co-authored-by: Pedro Castro <[email protected]> Co-authored-by: Keith Williams <[email protected]>
- Exclude 'link' toolbar item from Editor for all workflow actions (not just SMS) - Add replaceCloakedLinksInHtml utility to sanitize HTML and replace cloaked links with visible URLs - Apply sanitization to email content before sending in all workflow email paths This ensures recipients can see the actual destination of URLs, helping them identify potentially malicious links. Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )