feat: add new schedule table #13

not-SAINT · 2020-11-06T18:36:44Z

Добавлен базовый вид расписания в виде таблицы.
Типа событий не трогались.

yuliaHope · 2020-11-09T20:33:27Z

client/src/components/Schedule/TableView.tsx

+
+const timeRenderer = (timeZone: string) => (value: string) =>
+  value ? moment(value, 'YYYY-MM-DD HH:mmZ').tz(timeZone).format('HH:mm') : '';
+


Let's replace these two functions with a more generic one:

const renderDate = (timeZone: string, format: string) => (value: string) => value ? moment(value, 'YYYY-MM-DD HH:mmZ').tz(timeZone).format(format) : '';

or consider some of the methods from client/src/components/Table/renderers.tsx

yuliaHope · 2020-11-09T20:37:33Z

client/src/components/Schedule/TableView.tsx

+      // })}
+      columns={[
+        {
+          title: columnFilter(),


it will look more readable if we left <SettingOutlined /> here. The function that contains filter in the name and defines the title is a bit confusing...

yuliaHope · 2020-11-09T20:40:54Z

client/src/components/Schedule/TableView.tsx

+          width: 100,
+          dataIndex: ['event', 'type'],
+          render: (value: keyof typeof EventTypeColor) => (
+            <Tag color={EventTypeColor[value]}>{EventTypeToName[value] || value}</Tag>


Let's use renderTag method here. It's declared in client/src/components/Table/renderers.tsx

renderTag doesn't fit format, create new one in client/src/components/Table/renderers.tsx - eventColorTagRenderer

Why can't we do renderTag(EventTypeColor[value], EventTypeToName[value] || value)?

yuliaHope · 2020-11-09T20:48:43Z

client/src/components/Schedule/TableView.tsx

+          render: (value: string, record) => {
+            return record.event.descriptionUrl ? (
+              <a target="_blank" href={record.event.descriptionUrl}>
+                {value}


Let's move it to it's own function

simplify render in one line

yuliaHope · 2020-11-09T20:50:05Z

client/src/components/Schedule/TableView.tsx

+            return url ? (
+              <Tooltip placement="topLeft" title={url}>
+                <a target="_blank" href={url}>
+                  {urlRenderer(url)}


There is no need for ternary operator. The construction can be simplified:

url => !!url && <Tooltip ...

yuliaHope · 2020-11-09T20:52:33Z

client/src/components/Schedule/TableView.tsx

+          title: 'Organizer',
+          width: 140,
+          dataIndex: ['organizer', 'githubId'],
+          render: (value: string) => (value ? <GithubUserLink value={value} /> : ''),


The same here and above. There is no need in ternary operator

yuliaHope · 2020-11-09T20:53:17Z

client/src/components/Schedule/TableView.tsx

+          title: 'Place',
+          dataIndex: 'place',
+          render: (value: string) => {
+            return value === 'Youtube Live' ? (


let's move the render to it's own function

yuliaHope · 2020-11-09T20:56:48Z

client/src/components/Schedule/TableView.tsx

+      //   },
+      // })}
+      columns={[
+        {


WDYT about moving the columns to it's own constant?

the columns depends on props (timeZone)...

It can be function... It won't improve performance, but will improve readability at least

yuliaHope · 2020-11-09T21:22:51Z

Добавлен базовый вид расписания в виде таблицы.
Типа событий не трогались.

Just out of curiosity , why the Date column have a different color?

yuliaHope · 2020-11-09T21:24:11Z

client/src/components/Schedule/TableView.tsx

+      //   onClick: ({ target }) => {
+      //     if (!target.closest('a')) {
+      //       // eslint-disable-next-line no-console
+      //       console.log('row is clicked');


Shouldn't this be uncommented?

remove comments

yuliaHope · 2020-11-09T21:39:27Z

May be something wrong in my setup, but looks like the filter doesn't work as expected.

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

* feat: add new schedule table (#13) * feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers * feat: add switcher schedule view mode * feat: add user settings * chore: refactor code - exclude switch * chore: refactor code * chore: refactor code - add uppercase * fix: implement correct localstorage hook * feat: add userSettings button on schedule page * feat: add user settings * refactor: change serialize/deserialize data * refactor: rename files and data * refactor: change tag color styles structure * refactor: rename vars for better readability * refactor: apply memoization to setTagColor * refactor: change structure of TagIcon * refactor: replace settings button, tweak button styles, change storedTagColors type Co-authored-by: notSAINT <60464016+not-SAINT@users.noreply.github.com> Co-authored-by: Aleksandr Sharikov <notsaint.mail@gmail.com>

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

* feat: add new schedule table (#13) * feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers * feat: add switcher schedule view mode * feat: add user settings * chore: refactor code - exclude switch * chore: refactor code * chore: refactor code - add uppercase * fix: implement correct localstorage hook * feat: add userSettings button on schedule page * feat: add user settings * refactor: change serialize/deserialize data * refactor: rename files and data * refactor: change tag color styles structure * refactor: rename vars for better readability * refactor: apply memoization to setTagColor * refactor: change structure of TagIcon * refactor: replace settings button, tweak button styles, change storedTagColors type Co-authored-by: notSAINT <60464016+not-SAINT@users.noreply.github.com> Co-authored-by: Aleksandr Sharikov <notsaint.mail@gmail.com>

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

* feat: add new schedule table (#13) * feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers * feat: add switcher schedule view mode * feat: add user settings * chore: refactor code - exclude switch * chore: refactor code * chore: refactor code - add uppercase * fix: implement correct localstorage hook * feat: add userSettings button on schedule page * feat: add user settings * refactor: change serialize/deserialize data * refactor: rename files and data * refactor: change tag color styles structure * refactor: rename vars for better readability * refactor: apply memoization to setTagColor * refactor: change structure of TagIcon * refactor: replace settings button, tweak button styles, change storedTagColors type Co-authored-by: notSAINT <60464016+not-SAINT@users.noreply.github.com> Co-authored-by: Aleksandr Sharikov <notsaint.mail@gmail.com>

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

* feat: add new schedule table (#13) * feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers * feat: add switcher schedule view mode * feat: add user settings * chore: refactor code - exclude switch * chore: refactor code * chore: refactor code - add uppercase * fix: implement correct localstorage hook * feat: add userSettings button on schedule page * feat: add user settings * refactor: change serialize/deserialize data * refactor: rename files and data * refactor: change tag color styles structure * refactor: rename vars for better readability * refactor: apply memoization to setTagColor * refactor: change structure of TagIcon * refactor: replace settings button, tweak button styles, change storedTagColors type Co-authored-by: notSAINT <60464016+not-SAINT@users.noreply.github.com> Co-authored-by: Aleksandr Sharikov <notsaint.mail@gmail.com>

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

feat: add new schedule table

d5c7d5c

not-SAINT requested a review from yuliaHope November 6, 2020 18:37

yuliaHope reviewed Nov 9, 2020

View reviewed changes

chore: refactor cells renderers

8af3a67

yuliaHope changed the base branch from master to schedule November 16, 2020 06:41

chore: refactor renderers

368ae8b

yuliaHope merged commit 2c90bb5 into schedule Nov 16, 2020

yuliaHope pushed a commit that referenced this pull request Nov 26, 2020

feat: add new schedule table (#13)

892d734

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

yuliaHope pushed a commit that referenced this pull request Apr 4, 2021

feat: add new schedule table (#13)

4ce2c85

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

yuliaHope pushed a commit that referenced this pull request Apr 4, 2021

feat: add new schedule table (#13)

5aeaca0

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

yuliaHope pushed a commit that referenced this pull request May 12, 2021

feat: add new schedule table (#13)

f9ffa71

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

yuliaHope pushed a commit that referenced this pull request May 12, 2021

feat: add new schedule table (#13)

a5ab78d

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

apalchys pushed a commit that referenced this pull request May 23, 2021

feat: add new schedule table (#13)

dd02509

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

apalchys pushed a commit that referenced this pull request May 23, 2021

feat: add new schedule table (#13)

5cce553

* feat: add new schedule table * chore: refactor cells renderers * chore: refactor renderers

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add new schedule table #13

feat: add new schedule table #13

not-SAINT commented Nov 6, 2020

yuliaHope Nov 9, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 16, 2020

not-SAINT Nov 16, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope Nov 16, 2020

not-SAINT Nov 16, 2020

yuliaHope commented Nov 9, 2020

yuliaHope Nov 9, 2020

not-SAINT Nov 12, 2020

yuliaHope commented Nov 9, 2020 •

edited

Loading


		const timeRenderer = (timeZone: string) => (value: string) =>
		value ? moment(value, 'YYYY-MM-DD HH:mmZ').tz(timeZone).format('HH:mm') : '';

feat: add new schedule table #13

feat: add new schedule table #13

Conversation

not-SAINT commented Nov 6, 2020

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

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

yuliaHope commented Nov 9, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yuliaHope commented Nov 9, 2020 • edited Loading

yuliaHope commented Nov 9, 2020 •

edited

Loading