From b5c95768a4a68afa109862ffd1b37a3ba1a4ec2e Mon Sep 17 00:00:00 2001 From: guga4ka Date: Wed, 20 Oct 2021 17:59:33 +0300 Subject: [PATCH 1/4] open search in Notion App --- extensions/search-notion/package.json | 2 +- extensions/search-notion/src/common/View.tsx | 3 ++- extensions/search-notion/src/common/notionApi.ts | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/search-notion/package.json b/extensions/search-notion/package.json index 4811d6fdbbf..c56a4b21ca3 100644 --- a/extensions/search-notion/package.json +++ b/extensions/search-notion/package.json @@ -4,7 +4,7 @@ "description": "Search Notion pages and open visited ones faster. No admin access required.", "icon": "command-icon.png", "author": "reckoning-dev", - "version": "1.0.0", + "version": "1.1.0", "license": "MIT", "commands": [ { diff --git a/extensions/search-notion/src/common/View.tsx b/extensions/search-notion/src/common/View.tsx index 20bbd8f3b47..e85842439b7 100644 --- a/extensions/search-notion/src/common/View.tsx +++ b/extensions/search-notion/src/common/View.tsx @@ -1,4 +1,4 @@ -import { ActionPanel, CopyToClipboardAction, List, OpenInBrowserAction, Icon } from "@raycast/api"; +import { ActionPanel, CopyToClipboardAction, List, OpenInBrowserAction, Icon, OpenAction } from "@raycast/api"; import type { QueryResultItem } from "./notionApi"; import { useVisitedUrls } from "./useVisitedUrls"; @@ -34,6 +34,7 @@ export const View = ({ sectionNames, queryResults, isLoading, onSearchTextChange + } /> diff --git a/extensions/search-notion/src/common/notionApi.ts b/extensions/search-notion/src/common/notionApi.ts index f68062d9e3b..83f038d8f06 100644 --- a/extensions/search-notion/src/common/notionApi.ts +++ b/extensions/search-notion/src/common/notionApi.ts @@ -17,6 +17,7 @@ export type QueryResultItem = { title: string; subtitle: string; url: string; + appUrl: string; accessoryTitle: string; icon: string; }; @@ -33,6 +34,7 @@ const parseRepositoryItem = (data: any) => { title: `${reg_title}`, subtitle: '', url: `https://www.notion.so/`+ `${item.id}`.replace(/-/g, ''), + appUrl: `notion://www.notion.so/`+ `${item.id}`.replace(/-/g, ''), accessoryTitle: acc_title, icon: page_icon, }; From d47d3b8fbb8fd3f576981cafd32a50d08617f000 Mon Sep 17 00:00:00 2001 From: guga4ka Date: Wed, 20 Oct 2021 18:23:01 +0300 Subject: [PATCH 2/4] case fix --- extensions/search-notion/src/common/View.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/search-notion/src/common/View.tsx b/extensions/search-notion/src/common/View.tsx index e85842439b7..735cb87e9ed 100644 --- a/extensions/search-notion/src/common/View.tsx +++ b/extensions/search-notion/src/common/View.tsx @@ -34,7 +34,7 @@ export const View = ({ sectionNames, queryResults, isLoading, onSearchTextChange - + } /> From bfece3ec2e83140d200c0ab2d57d7bbae5e19410 Mon Sep 17 00:00:00 2001 From: guga4ka Date: Mon, 25 Oct 2021 12:43:46 +0300 Subject: [PATCH 3/4] addressed review comments --- extensions/search-notion/src/common/View.tsx | 40 ++++++++++++++++--- .../search-notion/src/common/notionApi.ts | 6 +-- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/extensions/search-notion/src/common/View.tsx b/extensions/search-notion/src/common/View.tsx index 735cb87e9ed..c59e54ccab0 100644 --- a/extensions/search-notion/src/common/View.tsx +++ b/extensions/search-notion/src/common/View.tsx @@ -1,6 +1,15 @@ -import { ActionPanel, CopyToClipboardAction, List, OpenInBrowserAction, Icon, OpenAction } from "@raycast/api"; +import { + ActionPanel, + CopyToClipboardAction, + List, + OpenInBrowserAction, + Icon, + OpenAction, + getApplications, Application +} from "@raycast/api"; import type { QueryResultItem } from "./notionApi"; import { useVisitedUrls } from "./useVisitedUrls"; +import {useEffect, useState} from "react"; type Props = { @@ -11,6 +20,28 @@ type Props = { throttle?: boolean; }; +function OpenFileAction(props: { fileId: string, onOpen: (target: string) => void}) { + const [desktopApp, setDesktopApp] = useState() + + useEffect(() => { + getApplications() + .then((apps) => apps.find((a) => a.bundleId === "notion.id")) + .then(setDesktopApp) + }, []) + + return desktopApp ? ( + props.onOpen(props.fileId)} + /> + ) : ( + props.onOpen(props.fileId)}/> + ) +} + export const View = ({ sectionNames, queryResults, isLoading, onSearchTextChange, throttle }: Props): JSX.Element => { const [urls, onOpen] = useVisitedUrls(); return ( @@ -26,15 +57,14 @@ export const View = ({ sectionNames, queryResults, isLoading, onSearchTextChange - - - + + } /> diff --git a/extensions/search-notion/src/common/notionApi.ts b/extensions/search-notion/src/common/notionApi.ts index 83f038d8f06..21faf11d022 100644 --- a/extensions/search-notion/src/common/notionApi.ts +++ b/extensions/search-notion/src/common/notionApi.ts @@ -16,8 +16,7 @@ export type QueryResultItem = { id: string; title: string; subtitle: string; - url: string; - appUrl: string; + fileId: string; accessoryTitle: string; icon: string; }; @@ -33,8 +32,7 @@ const parseRepositoryItem = (data: any) => { id: `${item.id}`, title: `${reg_title}`, subtitle: '', - url: `https://www.notion.so/`+ `${item.id}`.replace(/-/g, ''), - appUrl: `notion://www.notion.so/`+ `${item.id}`.replace(/-/g, ''), + fileId: `${item.id}`.replace(/-/g, ''), accessoryTitle: acc_title, icon: page_icon, }; From 8d3524e035c448dbabd9e684bb5c4ad51570ecb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 08:16:19 +0000 Subject: [PATCH 4/4] Bump minimist from 1.2.5 to 1.2.8 in /extensions/coffee Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8. - [Release notes](https://github.com/minimistjs/minimist/releases) - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- extensions/coffee/package-lock.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/extensions/coffee/package-lock.json b/extensions/coffee/package-lock.json index 7b0bcb06b67..b4979d07e37 100644 --- a/extensions/coffee/package-lock.json +++ b/extensions/coffee/package-lock.json @@ -2396,10 +2396,13 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/mkdirp": { "version": "0.5.5", @@ -5728,9 +5731,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true }, "mkdirp": {