Merge branch 'master' into feat/guardrails

wandb · Jan 17, 2025 · 5661b1a · 5661b1a
2 parents bccc336 + 8d71115
commit 5661b1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...s/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx b/...s/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
@@ -183,7 +183,7 @@ const ObjectVersionPageInner: React.FC<{
     return data.result?.[0] ?? {};
   }, [data.loading, data.result]);
 
-  const showDeleteButton = useShowDeleteButton();
+  const showDeleteButton = useShowDeleteButton(entityName);
 
   const viewerDataAsObject = useMemo(() => {
     const dataIsPrimitive =

diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionPage.tsx
@@ -73,7 +73,7 @@ const OpVersionPageInner: React.FC<{
     // that data available yet.
     return true;
   }, []);
-  const showDeleteButton = useShowDeleteButton();
+  const showDeleteButton = useShowDeleteButton(entity);
 
   return (
     <SimplePageLayoutWithHeader

diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/DeleteModal.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/DeleteModal.tsx
@@ -103,9 +103,12 @@ export const DeleteModal: React.FC<DeleteModalProps> = ({
   );
 };
 
-export const useShowDeleteButton = () => {
-  const viewerInfo = useViewerInfo();
-  return viewerInfo.loading ? false : viewerInfo.userInfo?.admin;
+export const useShowDeleteButton = (entity: string) => {
+  const {loading: loadingUserInfo, userInfo} = useViewerInfo();
+  const viewerInfo = loadingUserInfo ? null : userInfo;
+  const viewer = viewerInfo ? viewerInfo.id : null;
+  const isReadonly = !viewer || !viewerInfo?.teams.includes(entity);
+  return !isReadonly;
 };
 
 const Dialog = styled(MaterialDialog)`