Skip to content

Commit

Permalink
fix: default to feature status entitled to avoid temporarily flashing…
Browse files Browse the repository at this point in the history
… error
  • Loading branch information
moughxyz committed Nov 27, 2021
1 parent 21433b5 commit 6f3a749
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/ComponentView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
const [isLoading, setIsLoading] = useState(false);
const [isReloading, setIsReloading] = useState(false);
const [loadTimeout, setLoadTimeout] = useState<number | undefined>(undefined);
const [featureStatus, setFeatureStatus] = useState<FeatureStatus | undefined>(undefined);
const [featureStatus, setFeatureStatus] = useState<FeatureStatus | undefined>(FeatureStatus.Entitled);
const [isComponentValid, setIsComponentValid] = useState(true);
const [error, setError] = useState<'offline-restricted' | 'url-missing' | undefined>(undefined);
const [isDeprecated, setIsDeprecated] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/views/tags/tags-view.pug
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#tags-column.sn-component.section.tags(aria-label='Tags')
.component-view-container(ng-if='self.component.active')
.component-view-container(ng-if='self.component && self.component.active')
component-view.component-view(
component-uuid='self.component.uuid',
application='self.application'
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/views/tags/tags_view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
beginStreamingItems() {
this.removeFoldersObserver = this.application.streamItems(
[ContentType.Component],
async (_items) => {
async () => {
this.component = this.application.componentManager
.componentsForArea(ComponentArea.TagsList)[0];
.componentsForArea(ComponentArea.TagsList).find((component) => component.active);
});

this.removeTagsObserver = this.application.streamItems(
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "standard-notes-web",
"version": "3.9.4",
"version": "3.9.5",
"license": "AGPL-3.0-or-later",
"repository": {
"type": "git",
Expand Down Expand Up @@ -72,7 +72,7 @@
"@reach/listbox": "^0.16.2",
"@standardnotes/features": "1.9.0",
"@standardnotes/sncrypto-web": "1.5.3",
"@standardnotes/snjs": "2.18.0",
"@standardnotes/snjs": "2.18.2",
"mobx": "^6.3.5",
"mobx-react-lite": "^3.2.1",
"preact": "^10.5.15",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2200,10 +2200,10 @@
buffer "^6.0.3"
libsodium-wrappers "^0.7.9"

"@standardnotes/[email protected].0":
version "2.18.0"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.18.0.tgz#0256998cc63902a54bc211aa6808d3dd64d13ef2"
integrity sha512-wwe+zyN7hYUZaoqVSinNNeKO0ng5xqYt0MD6Ga31EM0i1xm10GVP4QOjyzcgiEjEHbWXpTEC8MSw6gU6Glrwbg==
"@standardnotes/[email protected].2":
version "2.18.2"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.18.2.tgz#42957cf50b18e2db3f10dacb2c3dfa95c16719e7"
integrity sha512-KcYRwxJJmA+b9E0xXJGDsdCC3ptNaDLiGDpB8Lv4lUpjH6Z1VC43oxhFDXVxLLrQxTpQULvhlkW8Mc38Kxtzxg==
dependencies:
"@standardnotes/auth" "^3.8.1"
"@standardnotes/common" "^1.2.1"
Expand Down

0 comments on commit 6f3a749

Please sign in to comment.