Merge branch 'main' into feat/outline

decentraland · Sep 15, 2023 · 3822eda · 3822eda
2 parents cea0936 + 767716e
commit 3822eda
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/packages/@dcl/inspector/src/components/Assets/Assets.tsx b/packages/@dcl/inspector/src/components/Assets/Assets.tsx
@@ -5,7 +5,8 @@ import { FolderOpen } from '../Icons/Folder'
 import { MdImageSearch } from 'react-icons/md'
 import { HiOutlinePlus } from 'react-icons/hi'
 import { AssetsCatalog } from '../AssetsCatalog'
-import { catalog } from '../../lib/logic/catalog'
+import { AssetPack, catalog, isSmart } from '../../lib/logic/catalog'
+import { getConfig } from '../../lib/logic/config'
 import { getSelectedAssetsTab, selectAssetsTab } from '../../redux/ui'
 import { useAppDispatch, useAppSelector } from '../../redux/hooks'
 import { AssetsTab } from '../../redux/ui/types'
@@ -14,6 +15,13 @@ import ImportAsset from '../ImportAsset'
 
 import './Assets.css'
 
+function removeSmartItems(assetPack: AssetPack) {
+  return {
+    ...assetPack,
+    assets: assetPack.assets.filter((asset) => !isSmart(asset))
+  }
+}
+
 function Assets() {
   const dispatch = useAppDispatch()
   const tab = useAppSelector(getSelectedAssetsTab)
@@ -25,6 +33,11 @@ function Assets() {
     []
   )
 
+  const config = getConfig()
+  const filteredCatalog = config.disableSmartItems
+    ? catalog.map(removeSmartItems).filter((assetPack) => assetPack.assets.length > 0)
+    : catalog
+
   return (
     <div className="Assets">
       <div className="Assets-buttons">
@@ -47,7 +60,7 @@ function Assets() {
         </div>
       </div>
       <div className="Assets-content">
-        {tab === AssetsTab.AssetsPack && <AssetsCatalog catalog={catalog} />}
+        {tab === AssetsTab.AssetsPack && <AssetsCatalog catalog={filteredCatalog} />}
         {tab === AssetsTab.FileSystem && <ProjectAssetExplorer />}
         {tab === AssetsTab.Import && <ImportAsset onSave={handleTabClick(AssetsTab.FileSystem)} />}
       </div>

diff --git a/packages/@dcl/inspector/src/lib/logic/catalog.ts b/packages/@dcl/inspector/src/lib/logic/catalog.ts
@@ -46,3 +46,8 @@ export function getAssetsByCategory(assets: Asset[]) {
 
   return categories
 }
+
+export function isSmart(asset: Asset) {
+  const components = Object.keys(asset.components)
+  return components.length > 1 || (components.length === 1 && components[0] !== 'core::GltfContainer')
+}