ACL - Fix sheet bugs... 404, etc.

adobe · Jan 14, 2025 · 83d5f3e · 83d5f3e
1 parent b439523
commit 83d5f3e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/blocks/edit/da-title/da-title.css b/blocks/edit/da-title/da-title.css
@@ -46,10 +46,9 @@ h1 {
   position: absolute;
   width: 18px;
   height: 18px;
-  top: 50%;
+  top: 18px;
   left: -36px;
   background: url(/blocks/edit/img/Smock_LockClosed_18_N.svg) center center / 18px no-repeat;
-  transform: translateY(-50%);
 }
 
 .da-title-name-label {

diff --git a/blocks/sheet/utils/index.js b/blocks/sheet/utils/index.js
@@ -6,7 +6,7 @@ import '../da-sheet-tabs.js';
 const { loadStyle } = await import(`${getNx()}/scripts/nexter.js`);
 const loadScript = (await import(`${getNx()}/utils/script.js`)).default;
 
-const SHEET_TEMPLATE = { sheetName: 'data' };
+const SHEET_TEMPLATE = { minDimensions: [20, 20], sheetName: 'data' };
 
 let permissions;
 let canWrite;
@@ -39,7 +39,7 @@ function finishSetup(el, data) {
 
 function getDefaultSheet() {
   return [
-    { ...SHEET_TEMPLATE },
+    { ...SHEET_TEMPLATE, minDimensions: [20, 20] },
   ];
 }
 
@@ -71,7 +71,8 @@ const getColWidths = (colWidths, headers) => {
 
 function getSheet(json, sheetName) {
   const data = getSheetData(json.data);
-  const templ = canWrite ? { ...SHEET_TEMPLATE, minDimensions: [20, 20] } : SHEET_TEMPLATE;
+  const templ = { ...SHEET_TEMPLATE };
+  if (!canWrite) delete templ.minDimensions;
 
   return {
     ...templ,
@@ -87,15 +88,16 @@ export function getPermissions() {
 
 export async function getData(url) {
   const resp = await daFetch(url);
-  if (!resp.ok) return getDefaultSheet();
 
-  // Set permissions
+  // Set permissions even if the file is a 404
   const daTitle = document.querySelector('da-title');
   if (daTitle) daTitle.permissions = resp.permissions;
 
   permissions = resp.permissions;
   canWrite = resp.permissions.some((permission) => permission === 'write');
 
+  if (!resp.ok) return getDefaultSheet();
+
   const sheets = [];
 
   // Get base data

diff --git a/blocks/sheet/utils/utils.js b/blocks/sheet/utils/utils.js
@@ -11,7 +11,6 @@ function debounce(func, wait) {
 }
 
 export const saveSheets = async (sheets) => {
-  const daTitle = document.querySelector('da-title');
   document.querySelector('da-sheet-panes').data = convertSheets(sheets);
 
   const { hash } = window.location;