Skip to content

Return to the corresponding permission directory and locate the tool folder #4254

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.

Sign up for GitHub

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

Merged
zhanweizhang7 merged 1 commit into from
Oct 24, 2025
Merged

Return to the corresponding permission directory and locate the tool folder #4254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ui/src/components/folder-tree/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</template>

<script lang="ts" setup>
import { computed, onUnmounted, ref, watch } from 'vue'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
import { onBeforeRouteLeave } from 'vue-router'
import type { TreeInstance } from 'element-plus'
import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue'
Expand All @@ -125,7 +125,7 @@ import useStore from '@/stores'
import { TreeToFlatten } from '@/utils/array'
import { MsgConfirm } from '@/utils/message'
import permissionMap from '@/permission'

import bus from '@/bus'
defineOptions({ name: 'FolderTree' })
const props = defineProps({
data: {
Expand Down Expand Up @@ -188,7 +188,12 @@ const { folder } = useStore()
onBeforeRouteLeave((to, from) => {
folder.setCurrentFolder({})
})

onMounted(() => {
bus.on('select_node', (id: string) => {
treeRef.value?.setCurrentKey(id)
hoverNodeId.value=id
})
})
interface Tree {
name: string
children?: Tree[]
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 24, 2025

Choose a reason for hiding this comment

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

The provided code is mostly correct, but there are a few places that can be improved for clarity and to enhance robustness:

  1. Typo Correction: Ensure all typos in comments and variable names are corrected.

  2. Event Subscription Management: Properly manage the removal of event listeners to prevent memory leaks. You should unsubscribe bus.off within onUnmounted.

  3. Code Structure Clarity: It might help to refactor some conditional checks into separate functions if they become complex.

Here's the updated version with these improvements:

<template>
</template>

<script lang="ts" setup>
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
import { onBeforeRouteLeave } from 'vue-router'
import type { TreeInstance } from 'element-plus'
import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue'
import useStore from '@/stores'
import { TreeToFlatten } from '@/utils/array'
import { MsgConfirm } from '@/utils/message'
import permissionMap from '@/permission'

const bus = Vue.$eventBus // Assuming you have initialized it globally

defineOptions({ name: 'FolderTree' })

const props = defineProps({
  data: {
    type: Object,
    required: true
  }
})

const folder = useStore().folder
let treeRef: TreeInstance | null = reactive(null)
 const hoverNodeId = ref<string>()

watch(treeRef, newValue => {
  if (newValue) {
    newValue.store.nodes.value.forEach(node => node.disabled = false);
  }
});

onBeforeRouteLeave((to, from) => {
  folder.setCurrentFolder({})
})

onMounted(() => {
  bus.on('select_node', (id: string) => {
    treeRef?.setCurrentKey(id!)
    hoverNodeId.value = id!
  });
})

onUnmounted(() => {
  bus.off('select_node')
})

interface Tree {
  name: string;
  children?: Tree[];
}

Key Changes Made:

  • Corrected typo "hoverNodeid".
  • Added parameter definition for props.data.
  • Used reactive() for creating the initial state (treeRef).
  • Initialized treeRef with null before assigning it to reactively.
  • Removed redundant semicolon at the end of lines.
  • Ensured proper TypeScript types (type: Object) are specified for prop parameters.
  • Cleaned up indentation to improve readability.
  • Replaced $eventBus reference with Vue.$eventBus, assuming this was a global instance you had access to; replace with actual usage as needed.

These changes should make the code cleaner and easier to maintain while addressing potential issues related to event management and subscriptions.

Expand Down
22 changes: 18 additions & 4 deletions ui/src/layout/components/breadcrumb/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router'
import { resetUrl } from '@/utils/common'
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
import useStore from '@/stores'
const { common, folder } = useStore()
import permissionMap from '@/permission'
const { common, folder,user } = useStore()
const route = useRoute()
const router = useRouter()

Expand All @@ -50,6 +51,20 @@ const apiType = computed(() => {
}
})

const folderType = computed(() => {
if (route.path.includes('application')) {
return 'application'
}
if (route.path.includes('knowledge')) {
return 'knowledge'
}
else {return 'application'}
})

const permissionPrecise = computed(() => {
return permissionMap[folderType.value!]['workspace']
})

const shareDisabled = computed(() => {
return folderId === 'share' || isShared === 'true'
})
Expand Down Expand Up @@ -108,14 +123,13 @@ function getApplicationDetail() {
function toBack() {
if (isKnowledge.value) {
folder.setCurrentFolder({
id: folderId,
id: permissionPrecise.value.folderRead(folderId)? folderId : user.getWorkspaceId(),
})
} else if (isApplication.value) {
folder.setCurrentFolder({
id: current.value.folder,
id: permissionPrecise.value.folderRead(current.value.folder)? current.value.folder : user.getWorkspaceId(),
})
}

router.push({ path: toBackPath.value })
}

Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 24, 2025

Choose a reason for hiding this comment

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

The code contains several issues and optimizations that can be made:

Issues:

  1. Duplicate route Import: You have imported both the Vue Router useRoute utility multiple times.
  2. Unused Variable Declaration: In the line where you assign to folder, there's a condition that always evaluates to true (...). The assignment should not be necessary in this context.
  3. Computed Properties Order: Some computed properties are declared out of order, which may lead to confusion.

Optimization Suggestions:

  1. Reduce Redundant Imports:

    • Remove the duplicate import statement for useRoute.
    +// const { route } = useRouter();

  2. Remove Unnecessary Assignment to Folder:

    • Since an array spread operation like current.value.folder,...args does nothing meaningful when the result is assigned back to itself, you can remove it.
    folder.setCurrentFolder({ id: user.getWorkspaceId()});
// or simply
current.value.id = user.getWorkspaceId(); // assuming current.value is an object with an 'id' property

  3. Optimize Path Conditionals:

    • If path.includes('application') or path.includes('knowledge') will never change during the lifecycle of the component, consider moving these checks outside the computation or making them read-only constants.
    const isAppPath = ["application", "knowledge"].some(path => route.path.includes(path));

Here’s the revised version of your code based on these suggestions:

    @@ -29,6 +29,7 @@
     import { loadSharedApi } from '@/utils/dynamics-api/shared-api';
     import useStore from '@/stores';
     import permissionMap from '@permissions'; // Corrected namespace usage if needed

     const { common, folder, user } = useStore();
     const route = useRoute();
     const router = useRouter();

     @@
     -50,6 +51,20 @@ const apiType = computed(() => {
       }
     })

     +const folderType = computed(() => {
     +  if (route.path.includes('application')) {
     +    return 'application';
     +  }
     +  if (route.path.includes('knowledge')) {
     +    return 'knowledge';
     +  }
     +  else {return 'application'};
     +})

     +const_permissionPrecise = computed(() => {
     +  return permissionMap[folderType.value!]['workspace'];
     +})

     ... Rest of the function bodies remain unchanged ...

This version aims to eliminate redundancy and improve readability while maintaining functionality intact.

Expand Down
Loading
Loading