Fix old functions

Author: Marosvölgyi Zoltán

apps/sensenet/src/components/IconFromPath.tsx

@@ -87,7 +87,7 @@ const IconFromPath = ({
         const resizedsvg = svg
           .replace('width=', 'width="100%" oldwidth=')
           .replace('height=', 'height="100%" oldheight=')
-        options.repo.iconCache.set(path, resizedsvg)
+        options.repo.iconCache.set(svgPath, resizedsvg)
         setIcon(resizedsvg)
         return
       }

apps/sensenet/src/components/content/Explore.tsx

@@ -101,7 +101,8 @@ export function Explore({
   const pathFromUrl = useQuery().get('path')
   const snRoute = useSnRoute()
   const activeAction = snRoute.match!.params.action
-
+  const isNewGrid =
+    window.location.pathname === '/content/explorer/' || window.location.pathname === '/custom/explorer/root/'
   const onActivateItemOverride = async (activeItem: GenericContent) => {
     const expandedItem = await repository.load({
       idOrPath: activeItem.Id,
@@ -174,8 +175,6 @@ export function Explore({
       return <FullScreenLoader />
     }
 
-    const isNewGrid =
-      window.location.pathname === '/content/explorer/' || window.location.pathname === '/custom/explorer/root/'
     if (isNewGrid) {
       return (
         <>
@@ -218,7 +217,6 @@ export function Explore({
       )
     }
   }
-  console.log('theme:', theme)
   return (
     <LoadSettingsContextProvider>
       <CurrentContentProvider idOrPath={currentPath}>
@@ -235,19 +233,35 @@ export function Explore({
 
             <div className={`${classes.treeAndDatagridWrapper} leftTree theme-${theme.palette.type} `}>
               {hasTree && (
-                <div className="simpletree">
-                  <SimpleTree
-                    onItemClick={(item) => {
-                      onNavigate(item)
-                    }}
-                    parentPath={PathHelper.isAncestorOf(rootPath, currentPath) ? rootPath : currentPath}
-                    activeItemPath={currentPath}
-                    onTreeLoadingChange={onTreeLoadingChange}
-                    loadSettings={loadTreeSettings}
-                    onNavigate={onNavigate}
-                    rootLoaded={false}
-                  />
-                </div>
+                //
+                <>
+                  {!isNewGrid ? (
+                    <TreeWithData
+                      onItemClick={(item) => {
+                        onNavigate(item)
+                      }}
+                      parentPath={PathHelper.isAncestorOf(rootPath, currentPath) ? rootPath : currentPath}
+                      activeItemPath={currentPath}
+                      onTreeLoadingChange={onTreeLoadingChange}
+                      loadSettings={loadTreeSettings}
+                    />
+                  ) : (
+                    <div className="simpletree">
+                      <SimpleTree
+                        onItemClick={(item) => {
+                          onNavigate(item)
+                        }}
+                        parentPath={PathHelper.isAncestorOf(rootPath, currentPath) ? rootPath : currentPath}
+                        activeItemPath={currentPath}
+                        onTreeLoadingChange={onTreeLoadingChange}
+                        loadSettings={loadTreeSettings}
+                        onNavigate={onNavigate}
+                        rootLoaded={false}
+                      />
+                    </div>
+                  )}
+                  {/* */}
+                </>
               )}
               <div className={classes.exploreContainer}>{renderContent()}</div>
             </div>

apps/sensenet/src/components/tree/StyledTreeItem.tsx

@@ -7,6 +7,7 @@ import { ODataCollectionResponse } from '@sensenet/client-core'
 import { GenericContent } from '@sensenet/default-content-types'
 import { useRepository } from '@sensenet/hooks-react'
 import React, { useCallback, useEffect, useState } from 'react'
+import { useQuery } from '../../hooks'
 import { Icon } from '../Icon'
 import StyledTreeItemProps from './Props/StyledTreeItemProps'
 function isOpen(prop: any) {
@@ -36,21 +37,31 @@ export const StyledTreeItem = withStyles((theme: Theme) =>
 )((props: StyledTreeItemProps) => {
   const repo = useRepository()
   const [innerElements, setInnerElements] = useState<[]>()
-  // const [elementsLoaded, setElemetnsLoaded] = useState<boolean>()
   const loadCollectionCB = useCallback(() => {
     function loadCollection(): Promise<ODataCollectionResponse<GenericContent>> {
-      return repo.loadCollection<GenericContent>({
-        path: props.contentValue.Path,
-        oDataOptions: { select: ['Path', 'Name', 'DisplayName', 'Type', 'Actions'] },
-      })
+      const cacheKey = `collection_${props.contentValue.Path}`
+      const cachedData = sessionStorage.getItem(cacheKey)
+      const cacheTimestamp = sessionStorage.getItem(`${cacheKey}_timestamp`)
+      const now = new Date().getTime()
+
+      if (cachedData && cacheTimestamp && now - parseInt(cacheTimestamp, 10) < 30 * 1000) {
+        return Promise.resolve(JSON.parse(cachedData))
+      }
+
+      return repo
+        .loadCollection<GenericContent>({
+          path: props.contentValue.Path,
+          oDataOptions: { select: ['Path', 'Name', 'DisplayName', 'Type', 'Actions'] },
+        })
+        .then((result) => {
+          sessionStorage.setItem(cacheKey, JSON.stringify(result))
+          sessionStorage.setItem(`${cacheKey}_timestamp`, now.toString())
+          return result
+        })
     }
+
     const respRequest = loadCollection()
     respRequest.then((result: any) => {
-      //console.log('#tree: loadCollectionCB')
-      //const piso = isOpen(props['aria-expanded'])
-      //if (!elementsLoaded || (elementsLoaded && piso)) {
-      // setElemetnsLoaded(true)
-      //console.log('#tree:amottan piso:', piso, props.contentValue.Name)
       const elements = result?.d.results.map((innerChild: GenericContent) => {
         props.addItemToExpanded(innerChild)
         return (

apps/sensenet/src/style.css

@@ -181,6 +181,10 @@ SimpleTree
 .buttonPanel .MuiButton-label {
   flex-direction: column;
 }
+.MuiListItemIcon-root .svgicon {
+  width: 24px;
+  height: 24px;
+}
 /*.leftTree .MuiListItemIcon-root {
   border-left: 2px dotted #ccc;
   padding-left: 5px;

packages/sn-client-core/src/Repository/Repository.ts

@@ -96,7 +96,6 @@ export class Repository implements Disposable {
     if (this.configuration.token) {
       request.headers.append('Authorization', `Bearer ${this.configuration.token}`)
     }
-    console.log('load from cache')
     return await this.fetchMethod(request)
   }