Merge pull request #3105 from weseek/fix/4302-4473-use-isSharedUser

Fix/4302 4473 use is shared user

src/client/js/app.jsx

@@ -89,7 +89,7 @@ Object.assign(componentMappings, {
 
   'not-found-alert': <NotFoundAlert
     onPageCreateClicked={navigationContainer.setEditorMode}
-    isGuestUserMode={appContainer.currentUser == null}
+    isGuestUserMode={appContainer.isGuestUser}
     isHidden={pageContainer.state.isForbidden || pageContainer.state.isNotCreatable || pageContainer.state.isTrashPage}
   />,
 

src/client/js/components/Page/NotFoundAlert.jsx

@@ -41,10 +41,10 @@ const NotFoundAlert = (props) => {
 
 
         {isGuestUserMode && (
-        <UncontrolledTooltip placement="bottom" target="create-page-btn-wrapper-for-tooltip" fade={false}>
-          {t('Not available for guest')}
-        </UncontrolledTooltip>
-      )}
+          <UncontrolledTooltip placement="bottom" target="create-page-btn-wrapper-for-tooltip" fade={false}>
+            {t('Not available for guest')}
+          </UncontrolledTooltip>
+        )}
       </div>
     </div>
   );

src/client/js/components/PageAccessories.jsx

@@ -10,8 +10,7 @@ import PageAccessoriesContainer from '../services/PageAccessoriesContainer';
 
 const PageAccessories = (props) => {
   const { appContainer, pageAccessoriesContainer } = props;
-  const isGuestUser = appContainer.currentUser == null;
-  const isSharedUser = appContainer.isSharedUser;
+  const { isGuestUser, isSharedUser } = appContainer;
 
   return (
     <>

src/client/js/services/AppContainer.js

@@ -48,7 +48,10 @@ export default class AppContainer extends Container {
     }
 
     const isSharedPageElem = document.getElementById('is-shared-page');
-    this.isSharedUser = this.currentUser == null && isSharedPageElem != null;
+
+    // check what kind of user
+    this.isGuestUser = this.currentUser == null;
+    this.isSharedUser = isSharedPageElem != null && this.currentUser == null;
 
     const userLocaleId = this.currentUser?.lang;
     this.i18n = i18nFactory(userLocaleId);

src/client/js/services/PageContainer.js

@@ -107,14 +107,10 @@ export default class PageContainer extends Container {
     this.initStateMarkdown();
     this.checkAndUpdateImageUrlCached(this.state.likerUsers);
 
-    const { currentUser } = this.appContainer;
-
-    // check what kind of user
-    this.state.isGuestUser = currentUser == null;
-    this.state.isSharedUser = this.state.shareLinkId != null && currentUser == null;
+    const { isSharedUser } = this.appContainer;
 
     // see https://dev.growi.org/5fabddf8bbeb1a0048bcb9e9
-    const isAbleToGetAttachedInformationAboutPages = this.state.isPageExist && !this.state.isSharedUser;
+    const isAbleToGetAttachedInformationAboutPages = this.state.isPageExist && !isSharedUser;
 
     if (isAbleToGetAttachedInformationAboutPages) {
       this.retrieveSeenUsers();
@@ -152,9 +148,8 @@ export default class PageContainer extends Container {
 
 
   get isAbleToOpenPageEditor() {
-    const {
-      isGuestUser, isPageForbidden, isNotCreatable, isTrashPage,
-    } = this.state;
+    const { isPageForbidden, isNotCreatable, isTrashPage } = this.state;
+    const { isGuestUser } = this.appContainer;
 
     return (!isGuestUser && !isPageForbidden && !isNotCreatable && !isTrashPage);
   }
@@ -164,7 +159,8 @@ export default class PageContainer extends Container {
    * ex.) like, bookmark
    */
   get isAbleToShowPageReactionButtons() {
-    const { isTrashPage, isPageExist, isSharedUser } = this.state;
+    const { isTrashPage, isPageExist } = this.state;
+    const { isSharedUser } = this.appContainer;
 
     return (!isTrashPage && isPageExist && !isSharedUser);
   }