Commit Graph

609 Commits

Author SHA1 Message Date
469c0ed764 Add ELASTIC_URL env var to docker-compose
This should fix startup of the API server in docker-compose.
2022-03-17 09:28:34 -07:00
563131ea23 Fix/newsletter label not add (#256)
* default sort by savedAt to avoid recent read page to appear on top of the list

* revert lint on generated code

* fix elastic update script syntax error
2022-03-17 13:22:38 +08:00
a2ce98229e default sort by savedAt to avoid recent read page to appear on top of… (#254)
* default sort by savedAt to avoid recent read page to appear on top of the list

* revert lint on generated code
2022-03-17 10:54:00 +08:00
af037a2837 make readingProgress required in the elastic page data (#253)
* make readingProgress required in the elastic page data

* delete readingProgress from function_resolvers because we have stored them in elastic
2022-03-17 10:06:21 +08:00
46f9306e17 Merge pull request #249 from omnivore-app/fix/elastic-reading-progress-nulls
Fix/elastic reading progress nulls
2022-03-16 14:35:45 -07:00
89f3719ba3 Fix linting 2022-03-16 14:23:39 -07:00
3d5a61285c Merge pull request #247 from omnivore-app/fix/app-scrolling
In /app use the window to scroll to initial read position
2022-03-16 14:07:16 -07:00
0314d8cf17 Add some extra logging 2022-03-16 13:53:55 -07:00
dc27c0c7a4 Return 0 if looking up page reading progress fails 2022-03-16 13:33:36 -07:00
bef3dbd23a Merge pull request #248 from omnivore-app/fix/elastic-reading-progress-nulls
Remove function handlers for reading progress
2022-03-16 13:18:29 -07:00
27143cbedf Remove function handlers for reading progress
These shouldn't be needed anymore because the values are stored
in elastic.
2022-03-16 13:11:36 -07:00
463e569e57 In /app use the window to scroll to initial read position
There isn't a scrollElementRef in `/app` because there is no
fixed header, so this will scroll the entire document instead.
2022-03-16 12:47:28 -07:00
88103cba9f Merge pull request #162 from omnivore-app/dependabot/npm_and_yarn/apollo-datasource-3.3.1
Bump apollo-datasource from 0.7.3 to 3.3.1
2022-03-16 11:03:26 -07:00
aa2d107f97 Merge pull request #231 from omnivore-app/dependabot/npm_and_yarn/typeorm-0.2.45
Bump typeorm from 0.2.37 to 0.2.45
2022-03-16 10:44:04 -07:00
a7c4659d90 Merge pull request #234 from omnivore-app/dependabot/npm_and_yarn/radix-ui/react-dialog-0.1.7
Bump @radix-ui/react-dialog from 0.1.5 to 0.1.7
2022-03-16 09:06:02 -07:00
3b9e1d36ae Merge pull request #245 from omnivore-app/feature/add-label-to-newsletters
add Newsletter label to the page created by newsletters email
2022-03-16 08:59:24 -07:00
07dcd5da26 add label to page only if not exists 2022-03-16 23:00:37 +08:00
39b19da07f Merge pull request #243 from omnivore-app/chore/update-swift-five-six
Update to Swift 5.6
2022-03-16 07:53:37 -07:00
1c4dcd7b00 automatically update updatedAt when page is updated in elastic 2022-03-16 22:28:39 +08:00
f412758040 add Newsletter label to the page created by newsletters email 2022-03-16 18:40:05 +08:00
27157006c1 use private bucket to upload page events (#244)
* use private bucket to upload page events

* fix tests

* add GCS_UPLOAD_PRIVATE_BUCKET in test env

* allow GCS_UPLOAD_PRIVATE_BUCKET to be empty
2022-03-16 14:39:07 +08:00
48e0a69931 Merge pull request #233 from omnivore-app/dependabot/npm_and_yarn/phosphor-react-1.4.1
Bump phosphor-react from 1.4.0 to 1.4.1
2022-03-15 22:13:44 -07:00
e25e6dc6c2 remove swiftformat warning 2022-03-15 21:52:17 -07:00
2a9ea0504e update to swift 5.6 2022-03-15 21:47:31 -07:00
e652a6ea8c Rebased version of the elastic PR (#225)
* Add elastic to our docker compose

* add AND/OR/NOT search operations

* add elastic and create article in elastic

* change error code when elastic throws error

* add search pages in elastic

* add search by labels

* Add elastic to GitHub Action

* Update elastic version

* Fix port for elastic

* add url in search query

* Set elastic features when running tests

* add debug logs

* Use localhost instead of service hostname

* refresh elastic after create/update

* update search labels query

* add typescript support

* search pages in elastic

* fix search queries

* use elastic for saving page

* fix test failure

* update getArticle api to use elastic

* use generic get page function

* add elastic migration python script

* fix bulk helper param

* save elastic page id in article_saving_request instead of postgres article_id

* fix page archiving and deleting

* add tests for deleteArticle

* remove custom date type in elastic mappings which not exist in older version of elastic

* fix timestamp format issue

* add tests for save reading progress

* add tests for save file

* optimize search results

* add alias to index

* update migration script to receive env var as params

* Add failing test to validate we don't decrease reading progress

This test is failing with Elastic because we aren't fetching
the reading progress from elastic here, and are fetching it
from postgres.

* Rename readingProgress to readingProgressPercent

This is the name stored in elastic, so fixes issues pulling the
value out.

* Linting

* Add failing test for creating highlights w/elastic

This test fails because the highlight can't be looked up. Is there
a different ID we should be passing in to query for highlights,
or do we need to update the query to look for elastic_id?

* add tests code coverage threshold

* update nyc config

* include more files in test coverage

* change alias name

* update updateContent to update pages in elastic

* remove debug log

* fix createhighlight test

* search pages by alias in elastic

* update set labels and delete labels in elastic

* migration script enumeration

* make BULK_SIZE an env var

* fix pdf search indexing

* debug github action exit issue

* call pubsub when create/update/delete page in elastic

* fix json parsing bug and reduce reading data from file

* replace a depreciated pubsub api call

* debug github action exit issue

* debug github action exit issue

* add handler to upload elastic page data to GCS

* fix tests

* Use http_auth instead of basic_auth

* add index creation and existing postgres tables update in migration script

* fix a typo to connect to elastic

* rename readingProgress to readingProgressPercent

* migrate elastic_page_id in highlights and article_saving_request tables

* update migration script to include number of updated rows

* update db migration query

* read index mappings from file

* fix upload pages to gcs

* fix tests failure due to pageContext

* fix upload file id not exist error

* Handle savedAt & isArchived attributes w/out quering elastic

* Fix prettier issues

* fix content-type mismatching

* revert pageId to linkId because frontend was not deployed yet

* fix newsletters and attachment not saved in elastic

* put linkId in article for setting labels

* exclude orginalHtml in the result of searching to improve performace

* exclude content in the result of searching to improve performace

* remove score sorting

* do not refresh immediately to reduce searching and indexing time

* do not replace the backup data in gcs

* fix no article id defined in articleSavingRequest

* add logging of elastic api running time

* reduce home feed pagination size to 15

* reduce home feed pagination size to 10

* stop revalidating first page

* do not use a separate api to fetch reading progress

* Remove unused comment

* get reading progress if not exists

* replace ngram tokenizer with standard tokenizer

* fix tests

* remove .env.local

* add sort keyword in searching to sort by score

Co-authored-by: Hongbo Wu <hongbo@omnivore.app>
2022-03-16 12:08:59 +08:00
c4a3edc6be Merge pull request #239 from omnivore-app/labels/db-migrations
Postgres migrations for the Elastic backend migration
2022-03-15 20:29:29 -07:00
d4a47259a4 Merge pull request #240 from omnivore-app/fix/ios14-refresh 2022-03-15 16:03:54 -07:00
2d258eaaf0 Remove unneeded file 2022-03-15 15:46:38 -07:00
f80b5df3e9 hide progress bar on ios14. show refresh button oin ios14 2022-03-15 15:13:58 -07:00
7461bdc8d7 Merge pull request #238 from omnivore-app/faeture/highlights-loading
PDF Highlights Loading
2022-03-15 14:38:50 -07:00
a4533dc016 Merge pull request #201 from omnivore-app/feature/beehiiv-newsletter-support
Support newsletters hosted on beehiiv
2022-03-15 14:03:55 -07:00
56c45fd1f6 Postgres migrations for the Elastic backend migration
These are cherry picked from the elastic branch so we can run them
and migrate data before moving to elastic as the primary page
backend.
2022-03-15 14:00:22 -07:00
2e01e910bd fetch pdf highlights when pdf is loaded rather than in library query 2022-03-15 10:28:06 -07:00
4a5d919dcb Merge pull request #237 from omnivore-app/feature/handle-async-image-errors
Apple async image errors
2022-03-15 10:04:12 -07:00
388bbde064 Merge pull request #235 from omnivore-app/fix/reading-progress-lookup
Dont make queries for readingProgressPercent unless we have to
2022-03-15 09:26:03 -07:00
eecbeb7705 pass viewbuilder to async image so we can handle errors 2022-03-14 21:42:24 -07:00
330b8e8dda publish an error value from ImageLoader 2022-03-14 16:38:25 -07:00
d65e3aff87 Merge pull request #236 from omnivore-app/chore/ios-version-bump
Fix: Category List Selection Color
2022-03-14 16:35:59 -07:00
6c913223b1 modify category list selected background color 2022-03-14 15:44:22 -07:00
8e1b4fb1a4 Formatting 2022-03-14 15:36:17 -07:00
a81181ee60 Dont make queries for readingProgressPercent unless we have to 2022-03-14 15:22:53 -07:00
c4c4a80a6c Merge pull request #230 from omnivore-app/fix/description-entities
Better handling of HTML entities in descriptions
2022-03-14 14:33:16 -07:00
39d24c6525 Bump @radix-ui/react-dialog from 0.1.5 to 0.1.7
Bumps [@radix-ui/react-dialog](https://github.com/radix-ui/primitives) from 0.1.5 to 0.1.7.
- [Release notes](https://github.com/radix-ui/primitives/releases)
- [Changelog](https://github.com/radix-ui/primitives/blob/main/release-process.md)
- [Commits](https://github.com/radix-ui/primitives/commits)

---
updated-dependencies:
- dependency-name: "@radix-ui/react-dialog"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 21:22:04 +00:00
d31d3fecf0 Bump phosphor-react from 1.4.0 to 1.4.1
Bumps [phosphor-react](https://github.com/phosphor-icons/phosphor-react) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/phosphor-icons/phosphor-react/releases)
- [Commits](https://github.com/phosphor-icons/phosphor-react/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: phosphor-react
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 21:21:28 +00:00
cfd143b504 Bump typeorm from 0.2.37 to 0.2.45
Bumps [typeorm](https://github.com/typeorm/typeorm) from 0.2.37 to 0.2.45.
- [Release notes](https://github.com/typeorm/typeorm/releases)
- [Changelog](https://github.com/typeorm/typeorm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/typeorm/typeorm/compare/0.2.37...0.2.45)

---
updated-dependencies:
- dependency-name: typeorm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 21:19:19 +00:00
c79e740ceb Add package 2022-03-14 11:13:59 -07:00
0361ef86fa Better handling of HTML entities in descriptions
The HTML code method didnt implent all possible
entities, causing some (usually rquote) to display.
2022-03-14 11:02:08 -07:00
594350a4bf Merge pull request #229 from omnivore-app/fix/published-dates
Attempt to set publishedDate if readability fails to parse it
2022-03-14 10:37:19 -07:00
fc7d972855 Fix typo in readability date handling causing this parse issue
Can remove our special handler for the published date now that we
are pulling it out correctly.
2022-03-14 10:20:19 -07:00
5983cfe2a6 Attempt to set publishedDate if readability fails to parse it
This can happen if JSONLD fails to load. The test page here has
an encoding issue that causes the oembed jsonld to fail to load
and then readability fails to parse the date.
2022-03-13 21:23:51 -07:00