From b3f5d9ea06265d55a0d7513320d43b0ee03760c0 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sat, 8 Jul 2023 11:23:05 +0800 Subject: [PATCH] Fix getPermissions() crash issue. --- web/src/App.test.js | 11 ++++++----- web/src/FileTree.js | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/web/src/App.test.js b/web/src/App.test.js index 3270402..a2a61c9 100644 --- a/web/src/App.test.js +++ b/web/src/App.test.js @@ -1,10 +1,11 @@ import React from "react"; -import ReactDOM from "react-dom"; +import {render} from "@testing-library/react"; import App from "./App"; // eslint-disable-next-line no-undef -it("renders without crashing", () => { - const div = document.createElement("div"); - ReactDOM.render(, div); - ReactDOM.unmountComponentAtNode(div); +test("renders learn react link", () => { + const {getByText} = render(); + const linkElement = getByText(/learn react/i); + // eslint-disable-next-line no-undef + expect(linkElement).toBeInTheDocument(); }); diff --git a/web/src/FileTree.js b/web/src/FileTree.js index 86debe2..0ec838e 100644 --- a/web/src/FileTree.js +++ b/web/src/FileTree.js @@ -67,15 +67,15 @@ class FileTree extends React.Component { getPermissions() { PermissionBackend.getPermissions(Conf.AuthConfig.organizationName) - .then((permissions) => { - if (permissions.status === "ok") { - permissions = permissions.filter(permission => (permission.domains[0] === this.props.store.name) && permission.users.length !== 0); + .then((res) => { + if (res.status === "ok") { + const permissions = res.data.filter(permission => (permission.domains[0] === this.props.store.name) && permission.users.length !== 0); this.setState({ permissions: permissions, permissionMap: this.getPermissionMap(permissions), }); } else { - Setting.showMessage("error", `Failed to get permissions: ${permissions.msg}`); + Setting.showMessage("error", `Failed to get permissions: ${res.msg}`); } }); }