BOX-185: Доприкрутил API вместо mock-заглушек [part 2] [final] #56

azinit · 2021-08-12T16:45:44Z

DISCLAIMER

Изменений не так много, в основном опять же - из-за кодогенерации)

Этот файлик можно проигнорить при ревью

CHANGELOG

Можно по коммитам отследить :)

Доприкрутил оставшиеся эндпоинты
Поправил модель данных
Немного порефачил типы
Minor refinements
- Пофиксил тени
- Добавил обработку defaultavatar
- Поправил отображение скелетонов

azinit

self-reviewed

azinit · 2021-08-12T16:48:03Z

src/api/types.ts

+export interface Question {
+  readonly topic: string;
+  readonly author: CommentUser;
+  readonly when: string;
+  readonly text: React.ReactNode;
+  readonly resolved?: boolean;
+  readonly responses: {
+    authors: string[];
+    count: number;
+    lastReponseAt: string;
+  };
+}
+export interface Answer {
+  readonly author: CommentUser;
+  readonly title: string;
+  readonly when: string;
+  readonly why: 'liked' | false;
+  readonly text: React.ReactNode;
+}


note: Позже прикрутим реальную АПИху для комментов

azinit · 2021-08-12T16:48:40Z

src/entities/card/organisms/card-list.tsx

+// FIXME: remove component as redundant later
+
 interface Props {
  cards: Card[];
  getHref?: (data: Card) => string | undefined;
  getUserHref?: (data: Card) => string | undefined;
+  // FIXME: will be removed later
+  getUser: (data: Card) => User;


note: Меня оч корежит этот пропс-дриллинг и файлы **-list, поэтому позже как удалим - это автоматически устранится

azinit · 2021-08-12T16:49:49Z

src/entities/card/organisms/card-preview.tsx

+          {/* FIXME: resolve better later */}
+          <Editor value={content as EditorValue} readOnly={true} />
        </>
      )}
      {size === 'small' && (
        <ItemEditorContainer>
-          {/* FIXME: resolve EditorValue BOX-185 */}
-          <Editor value={content as any} readOnly={true} />
+          {/* FIXME: resolve better later */}
+          <Editor value={content as EditorValue} readOnly={true} />


note: Хз как лучше зарезолвить, ибо это генерится с typed-contracts

azinit · 2021-08-12T16:50:38Z

src/features/search-bar/models/index.ts

+// FIXME: move logic to entities level?
+sample({
+  source: cardsSearchFx.doneData,
+  fn: ({ answer }) => answer.users as User[],
+  target: userModel.updateMap,
+});


note: Для KV кэша

azinit · 2021-08-12T16:52:14Z

src/pages/home/index.tsx

+  const topCards = useStore(model.$topCards);
+  const latestCards = useStore(model.$latestCards);
+  const usersMap = useStore(userModel.$usersMap);
+
+  // FIXME: temp handlers
+  const handleUser = useCallback(
+    (card: Card) => {
+      const user = usersMap[card.authorId];
+      return user;
+    },
+    [usersMap],
+  );
+
+  const handleUserHref = useCallback(
+    (card: Card) => {
+      const user = usersMap[card.authorId];
+      return paths.user(user.username);
+    },
+    [usersMap],
+  );
+
+  const handleCardHref = useCallback((card: Card) => {
+    return paths.card(card.id);
+  }, []);


note: Самому оч не нравится, но когда задекомпозим нормально по слоям - и страница более тонкой станет

azinit · 2021-08-12T16:52:54Z

src/pages/home/model.ts

+// FIXME: move to entities/card level later? (as cache store?)
+export const $topCards = createStore<Card[]>([]);
+export const $latestCards = createStore<Card[]>([]);


note: Пока показалось, что такое лучше всеж хранить на уровне страницы

azinit · 2021-08-12T16:53:12Z

src/pages/search/page.tsx

+const CardResults = () => {
+  const usersMap = useStore(userModel.$usersMap);
+  const cards = useStore(searchModel.$cardList);
+  const isLoading = useStore(model.$isShowLoading);
+
+  return (
+    <CardList
+      cards={cards}
+      getHref={(card) => paths.card(card.id)}
+      loading={isLoading}
+      getUser={(card) => usersMap[card.authorId]}
+    />
+  );
+};


note: По совету @sergeysova

azinit · 2021-08-12T16:53:42Z

src/pages/user/index.tsx

+              {Boolean(socials.length) && (
+                <SocialStaff>
+                  <SocialStaffTitle>Social staff</SocialStaffTitle>
+                  <SocialStaffList>
+                    {socials.map((social) => (
+                      <SocialStaffItem key={social.id}>
+                        <SocialLink href={social.link}>
+                          {avatar && <Avatar size="small" src={avatar} />}
+                          <SocialStaffItemText>
+                            @{social.username}
+                          </SocialStaffItemText>
+                        </SocialLink>
+                      </SocialStaffItem>
+                    ))}
+                  </SocialStaffList>
+                </SocialStaff>
+              )}
            </UserSocial>
-            {avatar && (
-              <UserLogo>
-                <StAvatar size="large" src={avatar} />
-              </UserLogo>
-            )}
+            {/* FIXME: move to entities/user logic */}
+            <UserLogo>
+              <StAvatar size="large" src={avatar || imgLogo} />
+            </UserLogo>


note: Тож декомпозируем позж при рефакторинге

azinit · 2021-08-12T17:16:37Z

src/pages/card/view/model.ts

+// FIXME: Временный хак, чтобы запросить сессию с клиента для одной страницы
+// (пока что нужно только на CardViewPage, но позже будет фетчится нормальным способом, когда подтянем авторизацию)
+sample({
+  source: pageLoaded,
+  target: sessionModel._sessionLoadedClient,
+});
+


note: Если есть получше методы обойти это - пишите)

…-смену-моковым-2

azinit · 2021-08-12T18:19:34Z

src/api/internal/index.gen.ts

@@ -241,7 +241,6 @@ export const cardsSearchOk = typed.object({
      roles: typed.array(typed.string).maybe,


note: Можно игнорить файл при ревью (codegen)

azinit · 2021-08-12T18:20:42Z

src/entities/user/model/index.ts

+export const $currentUser = createStore<User | null>(null);
+
+// FIXME: temp solution
+export const $usersMap = createStore<Record<string, User>>({});


note: Потом мб уберем KV store, посмотрим

azinit · 2021-08-12T18:23:03Z

src/shared/assets/index.ts

+import imgLogo from './logo.png';
+
+export { imgLogo };


note: Про проблемы реэкспорта помню, но и ассеты по проекту плодить не хочется "по месту использования")

src/pages/user/index.tsx

azinit added 17 commits August 11, 2021 21:36

BOX-185: @chore(bind-api): update api

f592760

BOX-185: @refactor(bind-api): bind with UserPage

739bb29

BOX-185: @refactor(bind-api): fix default avatar

80764b1

BOX-185: @refactor(bind-api): bind with /cards.list (for user)

cb1269b

BOX-185: @refactor(bind-api): bind with /cards.feed

8923e25

BOX-185: @refactor(bind-api): add card.author widget

add9a81

BOX-185: @refactor(bind-api): add users normalizing

5dc50d1

BOX-185: @refactor(bind-api): add card.author (for list of cards)

dc62bab

BOX-185: @refactor(bind-api): adapt search logic

8a2b51e

BOX-185: @refactor(bind-api): add viewer checking

00e257b

BOX-185: @refactor(bind-api): fix types

8c962b7

BOX-185: @refactor(bind-api): minor types refinements

31de0fd

BOX-185: @refactor(bind-api): hide socials if not exists

c5e1a31

BOX-185: @refactor(bind-api): refine pending for UserPage

bc6f1c2

BOX-185: @chore(bind-api): update API

b40755f

BOX-185: @refactor(bind-api): refine pending for CardPage

97ab9d8

BOX-185: @fix: refine shadows (from design)

8c7a122

github-actions bot added Frontend Refactoring labels Aug 12, 2021

azinit added 2 commits August 12, 2021 20:01

BOX-185: @review(bind-api): self-review

acf5cee

BOX-185: @fix(search-users): minor refinements

ba2a844

azinit changed the title ~~BOX-185: Доприкрутил API вместо mock-заглушек~~ BOX-185: Доприкрутил API вместо mock-заглушек [part 2] [final] Aug 12, 2021

azinit commented Aug 12, 2021

View reviewed changes

azinit added 3 commits August 12, 2021 20:30

BOX-185: @review(search-users): update API (prepare to merge)

b0a5936

Merge branch 'master' into feature/box-185-прикрутить-реальную-api-на…

b27faca

…-смену-моковым-2

BOX-185: @review(bind-api): self-review

199609e

azinit commented Aug 12, 2021

View reviewed changes

azinit requested a review from dmi-ch August 12, 2021 18:23

azinit requested review from asvtsv, antonmazhuto and Kater-auf-Dach August 12, 2021 18:23

antonmazhuto reviewed Aug 13, 2021

View reviewed changes

src/pages/user/index.tsx Show resolved Hide resolved

azinit requested a review from antonmazhuto August 13, 2021 12:04

sergeysova approved these changes Aug 13, 2021

View reviewed changes

antonmazhuto approved these changes Aug 13, 2021

View reviewed changes

azinit merged commit dd48cc7 into master Aug 13, 2021

azinit deleted the feature/box-185-прикрутить-реальную-api-на-смену-моковым-2 branch August 13, 2021 15:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BOX-185: Доприкрутил API вместо mock-заглушек [part 2] [final] #56

BOX-185: Доприкрутил API вместо mock-заглушек [part 2] [final] #56

azinit commented Aug 12, 2021 •

edited

Loading

azinit left a comment

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

azinit Aug 12, 2021

		@@ -241,7 +241,6 @@ export const cardsSearchOk = typed.object({
		roles: typed.array(typed.string).maybe,

BOX-185: Доприкрутил API вместо mock-заглушек [part 2] [final] #56

BOX-185: Доприкрутил API вместо mock-заглушек [part 2] [final] #56

Conversation

azinit commented Aug 12, 2021 • edited Loading

DISCLAIMER

CHANGELOG

azinit left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

azinit commented Aug 12, 2021 •

edited

Loading