1.5.2: html functions, DB Row Iterator, and more

adminPanel/src/elements/sidebar.js

@@ -8,8 +8,7 @@ export default function Sidebar(props) {
         showDialog: props.showDialog || function() {},
         api: props.api,
         notifications: props.notifications || [ ],
-        contactRequests: props.contactRequests || [ ],
-        filesPath: props.filesPath || null
+        contactRequests: props.contactRequests || [ ]
     };
 
     function onLogout() {
@@ -86,16 +85,6 @@ export default function Sidebar(props) {
         );
     }
 
-    let filePath = parent.filesPath;
-    if (filePath) {
-        li.push(<li className={"nav-item"} key={"files"}>
-            <a href={filePath} className={"nav-link"} target={"_blank"} rel={"noopener"}>
-                <Icon icon={"folder"} className={"nav-icon"} />
-                <p>Files</p>
-            </a>
-        </li>);
-    }
-
     li.push(<li className={"nav-item"} key={"logout"}>
         <a href={"#"} onClick={() => onLogout()} className={"nav-link"}>
             <Icon icon={"arrow-left"} className={"nav-icon"} />

adminPanel/src/index.js

@@ -32,8 +32,7 @@ class AdminDashboard extends React.Component {
       loaded: false,
       dialog: { onClose: () => this.hideDialog() },
       notifications: [ ],
-      contactRequests: [ ],
-      filesPath: null
+      contactRequests: [ ]
     };
   }
 
@@ -71,35 +70,12 @@ class AdminDashboard extends React.Component {
     });
   }
 
-  fetchFilesPath() {
-    this.api.getRoutes().then((res) => {
-      if (!res.success) {
-        this.showDialog("Error fetching routes: " + res.msg, "Error fetching routes");
-      } else {
-        for (const route of res.routes) {
-          if (route.target === "\\Documents\\Files") {
-            // prepare the path patterns, e.g. '/files(/.*)?' => '/files'
-            let path = route.request;
-            path = path.replace(/\(.*\)([?*])/g, ''); // remove optional and 0-n groups
-            path = path.replace(/.\*/g, ''); // remove .*
-            path = path.replace(/\[.*]\*/g, ''); // remove []*
-            path = path.replace(/(.*)\+/g, "$1"); // replace 1-n groups with one match
-            // todo: add some more rules, but we should have most of the cases now
-            this.setState({...this.state, filesPath: path });
-            break;
-          }
-        }
-      }
-    });
-  }
-
   componentDidMount() {
     this.api.fetchUser().then(Success => {
       if (!Success) {
         document.location = "/admin";
       } else {
         this.fetchNotifications();
-        this.fetchFilesPath();
         this.fetchContactRequests();
         setInterval(this.onUpdate.bind(this), 60*1000);
         this.setState({...this.state, loaded: true});
@@ -121,7 +97,7 @@ class AdminDashboard extends React.Component {
 
     return <Router>
         <Header {...this.controlObj} notifications={this.state.notifications} />
-        <Sidebar {...this.controlObj} notifications={this.state.notifications} contactRequests={this.state.contactRequests} filesPath={this.state.filesPath} />
+        <Sidebar {...this.controlObj} notifications={this.state.notifications} contactRequests={this.state.contactRequests}/>
         <div className={"content-wrapper p-2"}>
           <section className={"content"}>
             <Switch>