🐛 Fix query and restructure (#1324)

equinor · Jan 12, 2023 · f33903c · f33903c
1 parent 6178830
commit f33903c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 34 deletions.
diff --git a/studio/deskStructure.js b/studio/deskStructure.js
@@ -33,13 +33,13 @@ export const getDefaultDocumentNode = (props) => {
         })
         .title('Connected routes'),
     ])
-  } else if (schemaType === 'assetFile') {
+  } else if (['assetFile', 'videoFile'].includes(schemaType)) {
     return S.document().views([
       S.view.form(),
       S.view
         .component(DocumentsPane)
         .options({
-          query: `*[!(_id in path("drafts.**")) && references($id) && _type in ["news", "event", "page"]]`,
+          query: `*[!(_id in path("drafts.**")) && references($id) && _type in ["news", "event", "page","magazine"]]`,
           params: { id: `_id` },
           useDraft: false,
         })

diff --git a/studio/src/lib/structure/items/AssetLibrary.js b/studio/src/lib/structure/items/AssetLibrary.js
@@ -4,25 +4,13 @@ import { EdsIcon, FileIcon, LibraryIcon, TagMoreIcon } from '../../../../icons'
 import { Flags } from '../../datasetHelpers'
 import { AssetExtensionFilters } from './AssetExtensionFilters'
 import { AssetTagFilters } from './AssetTagFilters'
+import { UnusedAssetFilters } from './UnusedAssetFilters'
 
 const assetLibraryItems = [
   S.listItem()
     .title('Show all asset files')
     .icon(FileIcon)
     .child(S.documentTypeList('assetFile').id('allFiles').title('All files')),
-  Flags.IS_DEV &&
-    S.listItem()
-      .title('Show all unused asset files')
-      .icon(FileIcon)
-      .child(
-        S.documentTypeList('assetFile')
-          .apiVersion('2022-05-12')
-          .filter(
-            /* groq */ `_type in ["assetFile"] && count(*[references(^._id)]) == 0 && count(*[references(string::split(^._id,"drafts.")[1]+"")]) == 0`,
-          )
-          .id('allFiles')
-          .title('All unused files'),
-      ),
   S.divider(),
   AssetExtensionFilters(),
   AssetTagFilters(),
@@ -32,25 +20,7 @@ const assetLibraryItems = [
     .icon(TagMoreIcon)
     .child(S.documentTypeList('assetTag').id('manageAssetTags').title('Manage asset tags')),
   Flags.IS_DEV && S.divider(),
-  Flags.IS_DEV &&
-    S.listItem()
-      .title('Video Assets')
-      .icon(() => EdsIcon(play_circle_outlined))
-      .child(S.documentTypeList('videoFile').id('videoFiles').title('Video Files')),
-  Flags.IS_DEV &&
-    S.listItem()
-      .title('Unused Video Assets')
-      .icon(() => EdsIcon(play_circle_outlined))
-      .child(
-        S.documentTypeList('videoFile')
-          .apiVersion('2022-05-12')
-          .filter(
-            /* groq */ `_type in ["videoFile"] && count(*[ references(^._id) ]) == 0 && count(*[references(string::split(^._id,"drafts.")[1]+"")]) == 0`,
-          )
-
-          .id('videoFiles')
-          .title('Video Files'),
-      ),
+  Flags.IS_DEV && UnusedAssetFilters(),
 ].filter((e) => e)
 
 export const AssetLibrary = S.listItem()

diff --git a/studio/src/lib/structure/items/UnusedAssetFilters.js b/studio/src/lib/structure/items/UnusedAssetFilters.js
@@ -0,0 +1,44 @@
+import S from '@sanity/desk-tool/structure-builder'
+import { play_circle_outlined } from '@equinor/eds-icons'
+import { EdsIcon, FileIcon } from '../../../../icons'
+
+export const UnusedAssetFilters = () =>
+  S.listItem()
+    .title('Unused files')
+    .icon()
+    .child(S.list('unusedAssets').title('Unused Files').items(unusedTypesListItems))
+
+const unusedTypesListItems = [
+  S.listItem()
+    .title('Unused asset files')
+    .icon(FileIcon)
+    .child(
+      S.documentTypeList('assetFile')
+        .apiVersion('2022-05-12')
+        .filter(
+          /* groq */ ` _type in ["assetFile"] && (
+            (!(_id in path("drafts.**"))&& count(*[references(^._id)]) == 0)
+            ||
+            (_id in path("drafts.**") && count(*[^._id == "drafts." + _id]) == 0)
+            )`,
+        )
+        .id('allFiles')
+        .title('All unused files'),
+    ),
+  S.listItem()
+    .title('Unused video assets')
+    .icon(() => EdsIcon(play_circle_outlined))
+    .child(
+      S.documentTypeList('videoFile')
+        .apiVersion('2022-05-12')
+        .filter(
+          /* groq */ ` _type in ["videoFile"] && (
+            (!(_id in path("drafts.**"))&& count(*[references(^._id)]) == 0)
+            ||
+            (_id in path("drafts.**") && count(*[^._id == "drafts." + _id]) == 0)
+            )`,
+        )
+        .id('videoFiles')
+        .title('Video Files'),
+    ),
+]