fix: #313 fix again. Don't know why sonar-qube causes this

This commit is contained in:
Cindy Chang
2024-08-09 14:16:28 +08:00
parent 62cc0eeb52
commit 5ef681eea8
2 changed files with 14 additions and 7 deletions

View File

@@ -9,6 +9,7 @@ interface User {
name?: string;
is_admin?: boolean;
is_sso?: boolean;
isCurrentLoggedIn: boolean,
isDeleteHovered?: boolean;
isRowHovered?: boolean;
isEditHovered?: boolean;
@@ -23,8 +24,6 @@ interface EditDetail {
is_active: boolean;
}
const loginStore = piniaLoginStore();
export default defineStore('acctMgmtStore', {
state: () => ({
allUserAccoutList: [] as User[],
@@ -99,8 +98,12 @@ export default defineStore('acctMgmtStore', {
* Add some customization. For example, add isHovered field
*/
async customizeAllUserList(rawResponseData: User[]): Promise<User[]> {
const loginStore = piniaLoginStore();
await loginStore.getUserData();
const loginUserData:User = loginStore.userData;
return rawResponseData.map(user => ({
...user, // 保留後端傳來的欄位
isCurrentLoggedIn: loginUserData.username === user.username,
isDeleteHovered: false, // 針對前端顯示而額外增加的欄位
isRowHovered: false,
isEditHovered: false,
@@ -110,6 +113,7 @@ export default defineStore('acctMgmtStore', {
* Current logged in user should be placed at the first row on list
*/
async moveCurrentLoginUserToFirstRow(fetchedUserList: User[]): Promise<User[]> {
const loginStore = piniaLoginStore();
await loginStore.getUserData();
const loginUserData:User = loginStore.userData;
const foundLoginUserIndex = fetchedUserList.findIndex(user => user.username === loginUserData.username);