diff --git a/packages/web/src/appobj/ArchiveFileAppObject.svelte b/packages/web/src/appobj/ArchiveFileAppObject.svelte index 4cecca45d..a0f76e1a4 100644 --- a/packages/web/src/appobj/ArchiveFileAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFileAppObject.svelte @@ -54,11 +54,9 @@ 'matview.sql': 'img view', }; - function getArchiveIcon(archiveFilesAsDataSheets, data) { + function getArchiveIcon(data) { if (data.fileType == 'jsonl') { - return isArchiveFileMarkedAsDataSheet(archiveFilesAsDataSheets, data.folderName, data.fileName) - ? 'img free-table' - : 'img archive'; + return 'img archive'; } return ARCHIVE_ICONS[data.fileType]; } @@ -70,20 +68,14 @@ import ImportExportModal from '../modals/ImportExportModal.svelte'; import { showModal } from '../modals/modalTools'; - import { archiveFilesAsDataSheets, currentArchive, extensions, getCurrentDatabase, getExtensions } from '../stores'; + import { getExtensions } from '../stores'; import createQuickExportMenu from '../utility/createQuickExportMenu'; import { exportQuickExportFile } from '../utility/exportFileTools'; import openNewTab from '../utility/openNewTab'; import AppObjectCore from './AppObjectCore.svelte'; - import getConnectionLabel from '../utility/getConnectionLabel'; import InputTextModal from '../modals/InputTextModal.svelte'; import ConfirmModal from '../modals/ConfirmModal.svelte'; - import { - isArchiveFileMarkedAsDataSheet, - markArchiveFileAsDataSheet, - markArchiveFileAsReadonly, - } from '../utility/archiveTools'; import { apiCall } from '../utility/api'; export let data; @@ -116,12 +108,10 @@ }, }); }; - const handleOpenRead = () => { - markArchiveFileAsReadonly(data.folderName, data.fileName); + const handleOpenArchive = () => { openArchive(data.fileName, data.folderName); }; - const handleOpenWrite = () => { - markArchiveFileAsDataSheet(data.folderName, data.fileName); + const handleOpenDataSheet = () => { openNewTab({ title: data.fileName, icon: 'img free-table', @@ -141,11 +131,7 @@ }; const handleClick = () => { if (data.fileType == 'jsonl') { - if (isArchiveFileMarkedAsDataSheet($archiveFilesAsDataSheets, data.folderName, data.fileName)) { - handleOpenWrite(); - } else { - handleOpenRead(); - } + handleOpenArchive(); } if (data.fileType.endsWith('.sql')) { handleOpenSqlFile(); @@ -166,8 +152,8 @@ function createMenu() { return [ - data.fileType == 'jsonl' && { text: 'Open (readonly)', onClick: handleOpenRead }, - data.fileType == 'jsonl' && { text: 'Open as data sheet', onClick: handleOpenWrite }, + data.fileType == 'jsonl' && { text: 'Open', onClick: handleOpenArchive }, + data.fileType == 'jsonl' && { text: 'Open as data sheet', onClick: handleOpenDataSheet }, data.fileType == 'jsonl' && { text: 'Open in text editor', onClick: handleOpenJsonLinesText }, { text: 'Delete', onClick: handleDelete }, { text: 'Rename', onClick: handleRename }, @@ -232,7 +218,7 @@ {...$$restProps} {data} title={data.fileLabel} - icon={getArchiveIcon($archiveFilesAsDataSheets, data)} + icon={getArchiveIcon(data)} menu={createMenu} on:click={handleClick} /> diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts index a45a9812c..3c9f9d35c 100644 --- a/packages/web/src/stores.ts +++ b/packages/web/src/stores.ts @@ -84,7 +84,6 @@ export const pinnedDatabases = writableWithStorage([], 'pinnedDatabases'); export const pinnedTables = writableWithStorage([], 'pinnedTables'); export const commandsSettings = writable({}); export const allResultsInOneTabDefault = writableWithStorage(false, 'allResultsInOneTabDefault'); -export const archiveFilesAsDataSheets = writableWithStorage([], 'archiveFilesAsDataSheets'); export const commandsCustomized = derived([commands, commandsSettings], ([$commands, $commandsSettings]) => _.mapValues($commands, (v, k) => ({ // @ts-ignore diff --git a/packages/web/src/tabs/FreeTableTab.svelte b/packages/web/src/tabs/FreeTableTab.svelte index 55b660b72..361181abe 100644 --- a/packages/web/src/tabs/FreeTableTab.svelte +++ b/packages/web/src/tabs/FreeTableTab.svelte @@ -45,7 +45,6 @@ import SaveArchiveModal from '../modals/SaveArchiveModal.svelte'; import useEditorData from '../query/useEditorData'; import { apiCall } from '../utility/api'; - import { markArchiveFileAsDataSheet } from '../utility/archiveTools'; import { changeTab } from '../utility/common'; import { registerMenu } from '../utility/contextMenu'; import createActivator, { getActiveComponent } from '../utility/createActivator'; @@ -95,7 +94,6 @@ })); archiveFile = file; archiveFolder = folder; - markArchiveFileAsDataSheet(folder, file); }; function handleRunMacro(macro, params, cells) { diff --git a/packages/web/src/utility/archiveTools.ts b/packages/web/src/utility/archiveTools.ts deleted file mode 100644 index a9a059439..000000000 --- a/packages/web/src/utility/archiveTools.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { archiveFilesAsDataSheets } from '../stores'; - -export function markArchiveFileAsDataSheet(folder, file) { - archiveFilesAsDataSheets.update(ar => - ar.find(x => x.folder == folder && x.file == file) ? ar : [...ar, { folder, file }] - ); -} - -export function markArchiveFileAsReadonly(folder, file) { - archiveFilesAsDataSheets.update(ar => ar.filter(x => x.folder != folder || x.file != file)); -} - -export function isArchiveFileMarkedAsDataSheet(store, folder, file) { - return !!store.find(x => x.folder == folder && x.file == file); -} diff --git a/packages/web/src/widgets/AppFilesList.svelte b/packages/web/src/widgets/AppFilesList.svelte index 2747ba499..f1535af7e 100644 --- a/packages/web/src/widgets/AppFilesList.svelte +++ b/packages/web/src/widgets/AppFilesList.svelte @@ -33,7 +33,6 @@ import newQuery from '../query/newQuery'; import { currentApplication } from '../stores'; import { apiCall } from '../utility/api'; - import { markArchiveFileAsDataSheet } from '../utility/archiveTools'; import { useAppFiles, useArchiveFolders } from '../utility/metadataLoaders'; import openNewTab from '../utility/openNewTab'; import WidgetsInnerContainer from './WidgetsInnerContainer.svelte'; diff --git a/packages/web/src/widgets/ArchiveFilesList.svelte b/packages/web/src/widgets/ArchiveFilesList.svelte index 53ebbcc61..b3ed4a6b1 100644 --- a/packages/web/src/widgets/ArchiveFilesList.svelte +++ b/packages/web/src/widgets/ArchiveFilesList.svelte @@ -29,7 +29,6 @@ import { showModal } from '../modals/modalTools'; import { currentArchive } from '../stores'; import { apiCall } from '../utility/api'; - import { markArchiveFileAsDataSheet } from '../utility/archiveTools'; import { useArchiveFiles, useArchiveFolders } from '../utility/metadataLoaders'; import openNewTab from '../utility/openNewTab'; import WidgetsInnerContainer from './WidgetsInnerContainer.svelte'; @@ -54,7 +53,6 @@ file, data: createFreeTableModel(), }); - markArchiveFileAsDataSheet($currentArchive, file); openNewTab({ title: file,