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: user management followup #8458

Merged
merged 8 commits into from May 14, 2024
Merged

fix: user management followup #8458

merged 8 commits into from May 14, 2024

Conversation

DarkPhoenix2704
Copy link
Member

Change Summary

Provide summary of changes with issue number if any.

Change type

  • feat: (new feature for the user, not a new feature for build script)
  • fix: (bug fix for the user, not a fix to a build script)
  • docs: (changes to the documentation)
  • style: (formatting, missing semi colons, etc; no production code change)
  • refactor: (refactoring production code, eg. renaming a variable)
  • test: (adding missing tests, refactoring tests; no production code change)
  • chore: (updating grunt tasks etc; no production code change)

Test/ Verification

Provide summary of changes.

Additional information / screenshots (optional)

Anything for maintainers to be made aware of

@DarkPhoenix2704 DarkPhoenix2704 self-assigned this May 11, 2024
Copy link
Contributor

coderabbitai bot commented May 11, 2024

Walkthrough

Walkthrough

The recent updates introduce several enhancements and fixes across various components of the nc-gui package. Key changes include the addition of new computed properties and reactive variables in InviteDlg.vue, enhancements in workspace management in WorkspaceDelete.vue, and UI improvements in AccessSettings.vue and CollaboratorsList.vue. Additionally, sorting logic has been expanded in useUserSorts.ts, and a database migration script has been added to modify the image column in the ORG table.

Changes

Files/Paths Change Summary
packages/nc-gui/components/dlg/InviteDlg.vue Added new reactive variables, computed properties, and imported helper functions for handling role selection and workspace listing.
packages/nc-gui/components/dlg/WorkspaceDelete.vue Introduced functionality for deleting workspaces, including props, emits, and workspace management functions.
packages/nc-gui/components/project/AccessSettings.vue Added selected object, toggleSelectAll function, and modified selectAll computed property. Included NcCheckbox component in the template.
packages/nc-gui/components/workspace/CollaboratorsList.vue Updated workspace retrieval logic, modified updateCollaborator function, and made several template and CSS updates.
packages/nc-gui/components/workspace/View.vue Added a <component> tag with an arrow icon inside the <NuxtLink> element.
packages/nc-gui/composables/useUserSorts.ts Enhanced sorting logic to include baseCount, workspaceCount, and memberCount fields.
packages/nc-gui/lib/types.ts Modified UsersSortType interface to include memberCount, baseCount, and workspaceCount fields.
packages/nocodb/src/meta/migrations/v3/nc_o22_org_image.ts Added migration script to alter the image column in the ORG table using Knex.

**After:**
```html
<NuxtLink>
  <component :is="iconMap.arrowLeft" class="text-3xl"></component>
</NuxtLink>

packages/nc-gui/composables/useUserSorts.ts

Before:

// No previous declarations

After:

export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project' | 'Organization', sortsConfig: SortsConfig): number {
  // Sorting logic for 'baseCount', 'workspaceCount', and 'memberCount'
}

packages/nc-gui/lib/types.ts

Before:

interface UsersSortType {
  field: string;
  direction: 'asc' | 'desc';
}

After:

interface UsersSortType {
  field: 'memberCount' | 'baseCount' | 'workspaceCount' | string;
  direction: 'asc' | 'desc';
}

packages/nocodb/src/meta/migrations/v3/nc_o22_org_image.ts

Before:

// No previous declarations

After:

export async function up(knex: Knex): Promise<void> {
  await knex.schema.alterTable('ORG', (table) => {
    table.string('image').alter();
  });
}

export async function down(knex: Knex): Promise<void> {
  await knex.schema.alterTable('ORG', (table) => {
    table.dropColumn('image');
  });
}

-->


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 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.

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.
  • 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.

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.

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between c4440e4 and 2c75a99.
Files ignored due to path filters (1)
  • packages/nc-gui/lang/en.json is excluded by !**/*.json
Files selected for processing (8)
  • packages/nc-gui/components/dlg/InviteDlg.vue (10 hunks)
  • packages/nc-gui/components/dlg/WorkspaceDelete.vue (1 hunks)
  • packages/nc-gui/components/project/AccessSettings.vue (4 hunks)
  • packages/nc-gui/components/workspace/CollaboratorsList.vue (7 hunks)
  • packages/nc-gui/components/workspace/View.vue (1 hunks)
  • packages/nc-gui/composables/useUserSorts.ts (1 hunks)
  • packages/nc-gui/lib/types.ts (1 hunks)
  • packages/nocodb/src/meta/migrations/v3/nc_o22_org_image.ts (1 hunks)
Files skipped from review as they are similar to previous changes (8)
  • packages/nc-gui/components/dlg/InviteDlg.vue
  • packages/nc-gui/components/dlg/WorkspaceDelete.vue
  • packages/nc-gui/components/project/AccessSettings.vue
  • packages/nc-gui/components/workspace/CollaboratorsList.vue
  • packages/nc-gui/components/workspace/View.vue
  • packages/nc-gui/composables/useUserSorts.ts
  • packages/nc-gui/lib/types.ts
  • packages/nocodb/src/meta/migrations/v3/nc_o22_org_image.ts

Copy link
Contributor

github-actions bot commented May 11, 2024

Uffizzi Preview deployment-51594 was deleted.

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.

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 2c75a99 and eef22b9.
Files ignored due to path filters (1)
  • packages/nc-gui/lang/en.json is excluded by !**/*.json
Files selected for processing (8)
  • packages/nc-gui/components/dlg/InviteDlg.vue (10 hunks)
  • packages/nc-gui/components/dlg/WorkspaceDelete.vue (1 hunks)
  • packages/nc-gui/components/project/AccessSettings.vue (4 hunks)
  • packages/nc-gui/components/workspace/CollaboratorsList.vue (7 hunks)
  • packages/nc-gui/components/workspace/View.vue (1 hunks)
  • packages/nc-gui/composables/useUserSorts.ts (1 hunks)
  • packages/nc-gui/lib/types.ts (1 hunks)
  • packages/nocodb/src/meta/migrations/v3/nc_o22_org_image.ts (1 hunks)
Files skipped from review as they are similar to previous changes (8)
  • packages/nc-gui/components/dlg/InviteDlg.vue
  • packages/nc-gui/components/dlg/WorkspaceDelete.vue
  • packages/nc-gui/components/project/AccessSettings.vue
  • packages/nc-gui/components/workspace/CollaboratorsList.vue
  • packages/nc-gui/components/workspace/View.vue
  • packages/nc-gui/composables/useUserSorts.ts
  • packages/nc-gui/lib/types.ts
  • packages/nocodb/src/meta/migrations/v3/nc_o22_org_image.ts

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.

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between eef22b9 and d039549.
Files ignored due to path filters (1)
  • packages/nc-gui/lang/en.json is excluded by !**/*.json
Files selected for processing (7)
  • packages/nc-gui/components/dlg/InviteDlg.vue (10 hunks)
  • packages/nc-gui/components/dlg/WorkspaceDelete.vue (1 hunks)
  • packages/nc-gui/components/project/AccessSettings.vue (4 hunks)
  • packages/nc-gui/components/workspace/CollaboratorsList.vue (7 hunks)
  • packages/nc-gui/components/workspace/View.vue (1 hunks)
  • packages/nc-gui/composables/useUserSorts.ts (1 hunks)
  • packages/nc-gui/lib/types.ts (1 hunks)
Files skipped from review as they are similar to previous changes (7)
  • packages/nc-gui/components/dlg/InviteDlg.vue
  • packages/nc-gui/components/dlg/WorkspaceDelete.vue
  • packages/nc-gui/components/project/AccessSettings.vue
  • packages/nc-gui/components/workspace/CollaboratorsList.vue
  • packages/nc-gui/components/workspace/View.vue
  • packages/nc-gui/composables/useUserSorts.ts
  • packages/nc-gui/lib/types.ts

@DarkPhoenix2704 DarkPhoenix2704 merged commit 6c4d048 into develop May 14, 2024
20 of 23 checks passed
@DarkPhoenix2704 DarkPhoenix2704 deleted the nc-fix/adminpanel branch May 14, 2024 07:02
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.

None yet

3 participants