rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: default to feature status entitled to avoid temporarily flashing error

Browse Source
This commit is contained in:
Mo Bitar
2021-11-26 18:29:00 -06:00
parent 21433b5544
commit 6f3a749e52
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/ComponentView/index.tsx
View File

@@ -46,7 +46,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [isReloading, setIsReloading] = useState(false); const [isReloading, setIsReloading] = useState(false);
const [loadTimeout, setLoadTimeout] = useState<number | undefined>(undefined); 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 [isComponentValid, setIsComponentValid] = useState(true);
const [error, setError] = useState<'offline-restricted' | 'url-missing' | undefined>(undefined); const [error, setError] = useState<'offline-restricted' | 'url-missing' | undefined>(undefined);
const [isDeprecated, setIsDeprecated] = useState(false); const [isDeprecated, setIsDeprecated] = useState(false);

2
app/assets/javascripts/views/tags/tags-view.pug
View File

@@ -1,5 +1,5 @@
#tags-column.sn-component.section.tags(aria-label='Tags') #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-view.component-view(
component-uuid='self.component.uuid', component-uuid='self.component.uuid',
application='self.application' application='self.application'

4
app/assets/javascripts/views/tags/tags_view.ts
View File

@@ -106,9 +106,9 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
beginStreamingItems() { beginStreamingItems() {
this.removeFoldersObserver = this.application.streamItems( this.removeFoldersObserver = this.application.streamItems(
[ContentType.Component], [ContentType.Component],
async (_items) => { async () => {
this.component = this.application.componentManager this.component = this.application.componentManager
.componentsForArea(ComponentArea.TagsList)[0]; .componentsForArea(ComponentArea.TagsList).find((component) => component.active);
}); });
this.removeTagsObserver = this.application.streamItems( this.removeTagsObserver = this.application.streamItems(

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.9.4", "version": "3.9.5",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -72,7 +72,7 @@
"@reach/listbox": "^0.16.2", "@reach/listbox": "^0.16.2",
"@standardnotes/features": "1.9.0", "@standardnotes/features": "1.9.0",
"@standardnotes/sncrypto-web": "1.5.3", "@standardnotes/sncrypto-web": "1.5.3",
"@standardnotes/snjs": "2.18.0", "@standardnotes/snjs": "2.18.2",
"mobx": "^6.3.5", "mobx": "^6.3.5",
"mobx-react-lite": "^3.2.1", "mobx-react-lite": "^3.2.1",
"preact": "^10.5.15", "preact": "^10.5.15",

8
yarn.lock
View File

@@ -2200,10 +2200,10 @@
buffer "^6.0.3" buffer "^6.0.3"
libsodium-wrappers "^0.7.9" libsodium-wrappers "^0.7.9"
"@standardnotes/snjs@2.18.0": "@standardnotes/snjs@2.18.2":
version "2.18.0" version "2.18.2"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.18.0.tgz#0256998cc63902a54bc211aa6808d3dd64d13ef2" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.18.2.tgz#42957cf50b18e2db3f10dacb2c3dfa95c16719e7"
integrity sha512-wwe+zyN7hYUZaoqVSinNNeKO0ng5xqYt0MD6Ga31EM0i1xm10GVP4QOjyzcgiEjEHbWXpTEC8MSw6gU6Glrwbg== integrity sha512-KcYRwxJJmA+b9E0xXJGDsdCC3ptNaDLiGDpB8Lv4lUpjH6Z1VC43oxhFDXVxLLrQxTpQULvhlkW8Mc38Kxtzxg==
dependencies: dependencies:
"@standardnotes/auth" "^3.8.1" "@standardnotes/auth" "^3.8.1"
"@standardnotes/common" "^1.2.1" "@standardnotes/common" "^1.2.1"