Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix pro tag display #311

Merged
merged 1 commit into from
Feb 6, 2024
Merged

fix pro tag display #311

merged 1 commit into from
Feb 6, 2024

Conversation

formsdev
Copy link
Collaborator

@formsdev formsdev commented Feb 6, 2024

Summary by CodeRabbit

  • Refactor
    • Improved the ProTag component for better performance and reliability, ensuring a more responsive display based on user and workspace settings.

@formsdev formsdev requested a review from JhumanJ February 6, 2024 10:25
Copy link
Contributor

coderabbitai bot commented Feb 6, 2024

Walkthrough

The update to the ProTag component represents a significant overhaul aimed at modernizing its structure and logic. By adopting the Composition API, the refactor enhances code organization and scalability. Changes include updates to variable handling and a more sophisticated approach to determining when the ProTag is displayed, based on the characteristics of the user and their workspace. This modernization effort streamlines the component's functionality and aligns it with contemporary Vue.js best practices.

Changes

File(s) Summary of Changes
client/components/global/ProTag.vue Refactored to use Composition API, updated variable declarations, and revised display logic based on user and workspace properties.

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

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-tests for this file.
  • 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 tests 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 from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @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.
  • The JSON schema for the configuration file is available here.
  • 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Status

Actionable comments generated: 2

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between 418054a and 7fec3aa.
Files selected for processing (1)
  • client/components/global/ProTag.vue (1 hunks)
Additional comments: 2
client/components/global/ProTag.vue (2)
  • 39-52: Use of useRuntimeConfig().public.paidPlansEnabled directly within the computed property. This approach is fine, but ensure that useRuntimeConfig is reactive if the configuration can change during the app's runtime. If not, this is acceptable.
  • 39-52: The computed property workspace uses workspacesStore.getCurrent, which implies a method call. Ensure that getCurrent is a computed property or a getter in the store to avoid potential reactivity issues.

Comment on lines 36 to 53
</div>
</template>

<script>
<script setup>
import { computed } from 'vue'
import Modal from './Modal.vue'
import { useAuthStore } from '../../stores/auth';
import { useWorkspacesStore } from '../../stores/workspaces';
import PricingTable from "../pages/pricing/PricingTable.vue";

export default {
name: 'ProTag',
components: {PricingTable, Modal},
props: {},

setup () {
const authStore = useAuthStore()
const workspacesStore = useWorkspacesStore()
return {
user : computed(() => authStore.user),
currentWorkSpace : computed(() => workspacesStore.getCurrent())
}
},

data() {
return {
showPremiumModal: false,
checkoutLoading: false
}
},

computed: {
shouldDisplayProTag() {
if (!this.$config.paid_plans_enabled) return false
if (!this.user || !this.currentWorkSpace) return true
return !(this.currentWorkSpace.is_pro)
},
},

mounted() {
},

methods: {
openChat() {
useCrisp().openAndShowChat()
},
}
}
const authStore = useAuthStore()
const workspacesStore = useWorkspacesStore()
const user = computed(() => authStore.user)
const workspace = computed(() => workspacesStore.getCurrent)
const showPremiumModal = ref(false)

const shouldDisplayProTag = computed(() => {
if (!useRuntimeConfig().public.paidPlansEnabled) return false
if (!user.value || !workspace.value) return true
return !(workspace.value.is_pro)
})
</script>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 NOTE
This review was outside the diff hunks, and no overlapping diff hunk was found. Original lines [1-33]

Ensure accessibility by adding role="button" to the div acting as a button and providing a meaningful aria-label for better screen reader support.

<div class="bg-nt-blue text-white px-2 text-xs uppercase inline rounded-full font-semibold cursor-pointer"
+    role="button"
+    aria-label="Show premium options"
     @click.prevent="showPremiumModal=true"
>

Comment on lines +39 to +52
<script setup>
import { computed } from 'vue'
import Modal from './Modal.vue'
import { useAuthStore } from '../../stores/auth';
import { useWorkspacesStore } from '../../stores/workspaces';
import PricingTable from "../pages/pricing/PricingTable.vue";

export default {
name: 'ProTag',
components: {PricingTable, Modal},
props: {},

setup () {
const authStore = useAuthStore()
const workspacesStore = useWorkspacesStore()
return {
user : computed(() => authStore.user),
currentWorkSpace : computed(() => workspacesStore.getCurrent())
}
},

data() {
return {
showPremiumModal: false,
checkoutLoading: false
}
},

computed: {
shouldDisplayProTag() {
if (!this.$config.paid_plans_enabled) return false
if (!this.user || !this.currentWorkSpace) return true
return !(this.currentWorkSpace.is_pro)
},
},

mounted() {
},

methods: {
openChat() {
useCrisp().openAndShowChat()
},
}
}
const authStore = useAuthStore()
const workspacesStore = useWorkspacesStore()
const user = computed(() => authStore.user)
const workspace = computed(() => workspacesStore.getCurrent)
const showPremiumModal = ref(false)

const shouldDisplayProTag = computed(() => {
if (!useRuntimeConfig().public.paidPlansEnabled) return false
if (!user.value || !workspace.value) return true
return !(workspace.value.is_pro)
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The computed property shouldDisplayProTag returns true when !user.value || !workspace.value, which seems counterintuitive. If there's no user or workspace, it might be more logical to not display the ProTag, unless this behavior is explicitly intended.

Consider revising the logic to ensure it aligns with the intended behavior for when user or workspace information is missing.

@JhumanJ JhumanJ merged commit 2274bd1 into main Feb 6, 2024
4 checks passed
@JhumanJ JhumanJ deleted the fix-pro-tag-display branch February 6, 2024 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants