Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
a1a9384
rework structure of basic components
Davy-c Nov 29, 2021
22542ee
activate view creation
Davy-c Nov 29, 2021
53e8257
remove view folder component
Davy-c Nov 29, 2021
8946b9a
refactor form toggable input
Davy-c Nov 29, 2021
a2f8fc8
remove new folder content row
Davy-c Nov 29, 2021
4729f95
remove new doc content row
Davy-c Nov 29, 2021
dfde4c7
remove styled component for add row
Davy-c Nov 29, 2021
9ca7e61
finalize structure
Davy-c Nov 29, 2021
80fb709
Activate creation for views Selector
Davy-c Nov 29, 2021
b6a2790
memo for views selector
Davy-c Nov 29, 2021
353041e
LabelLike manager component
ButteryCrumpet Nov 29, 2021
8213809
integrate label manager into doc label picker
ButteryCrumpet Nov 29, 2021
7867cd1
display empty option
ButteryCrumpet Nov 29, 2021
428f341
move LabelManager to design folder
ButteryCrumpet Nov 29, 2021
dc6a6ec
allow editing of all tags in selector
ButteryCrumpet Nov 29, 2021
67dffc8
use localCompare
ButteryCrumpet Nov 29, 2021
ecbc76a
fix view effect when changing context
Davy-c Nov 29, 2021
e05a070
add view selecto to table layout
Davy-c Nov 29, 2021
f461a13
add move right and move left to view selector
Davy-c Nov 30, 2021
bf49134
name update
Davy-c Nov 30, 2021
f10b87a
fix padding for view selector
Davy-c Nov 30, 2021
dd846db
add id to forminput for arrowkey
Davy-c Nov 30, 2021
2d64524
disable move columns for extremes
Davy-c Nov 30, 2021
689e80b
handle selected view by memo hook
Davy-c Nov 30, 2021
440ddc8
extract prop suggestion selector
ButteryCrumpet Dec 1, 2021
91067ef
move PropsAddForm to design/
ButteryCrumpet Dec 1, 2021
f53861f
Docopsv3/calendar view (#1384)
Davy-c Dec 8, 2021
9627c08
Docops v3x/kanban component (#1391)
ButteryCrumpet Dec 9, 2021
750045d
fix calendar item overflow
Davy-c Dec 9, 2021
e590eea
remove unused item
Davy-c Dec 9, 2021
9f21ac6
fix alignment of view selector in kanban view
Davy-c Dec 9, 2021
feed058
remove extra css on nav items of kanban
Davy-c Dec 9, 2021
5e872eb
rename delete to hide
Davy-c Dec 9, 2021
c2d36e9
fix keynav of status selector
Davy-c Dec 9, 2021
0425fbf
fix add btn style
Davy-c Dec 9, 2021
127a365
remove box shadow in view selector
Davy-c Dec 9, 2021
e017ea6
fix keynav in suggestion select
Davy-c Dec 9, 2021
9ee6805
fix icon in suggestion select
Davy-c Dec 9, 2021
033a3ac
unify calendar and kanban props select (tmp)
Davy-c Dec 9, 2021
156e7ae
remove disabled button in calendar view
Davy-c Dec 9, 2021
b75a58c
change label from column to property in table
Davy-c Dec 9, 2021
da11fc4
hide statuses already present in selector
Davy-c Dec 9, 2021
9cee408
add creation after list ui
Davy-c Dec 9, 2021
bb3ab8f
change drag event to be on the whole header for kanban header
Davy-c Dec 9, 2021
b1a7308
fix icon and viewselector
Davy-c Dec 9, 2021
66d35fd
fix background of calendar buttons
Davy-c Dec 9, 2021
a0f5a9c
fix lexorank bug for default status list
Davy-c Dec 9, 2021
7350e54
remove border for new folder item in view manager
Davy-c Dec 9, 2021
be3d173
Discard unnecessary workspaceId validation when moving a resource
Rokt33r Dec 9, 2021
61bb316
remove properties from tableview
Davy-c Dec 9, 2021
43c8636
change kanban icon
Davy-c Dec 9, 2021
e2586c2
padding view selector
Davy-c Dec 9, 2021
6c843a5
toggable input for kanban list
Davy-c Dec 9, 2021
f8abe40
prevent focus bg with kanban
Davy-c Dec 9, 2021
0906de5
mixpanel for views
Davy-c Dec 9, 2021
085d9c8
new doc button same size as kanban items
Davy-c Dec 9, 2021
e50c001
fix kanban item global margins
Davy-c Dec 9, 2021
6027de5
change + button style in calendar
Davy-c Dec 9, 2021
319de0a
add number and text in add modal
Davy-c Dec 9, 2021
5344d4e
Implement updating page ordering
Rokt33r Dec 3, 2021
deb4793
Use updateFolderOrder method via cloud api hook
Rokt33r Dec 6, 2021
a9a9bd8
Fix dnd behavior of content row and ordering handle style
Rokt33r Dec 7, 2021
e9d38dc
Rename components of FolderList
Rokt33r Dec 7, 2021
c0d38a6
change style of kanban item
Davy-c Dec 9, 2021
f9e1c70
insert to bottom of list
Davy-c Dec 10, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 126 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@
"webpack-dev-server": "^3.11.0"
},
"dependencies": {
"@fullcalendar/daygrid": "^5.10.1",
"@fullcalendar/interaction": "^5.10.1",
"@fullcalendar/react": "^5.10.1",
"@dnd-kit/core": "^4.0.3",
"@dnd-kit/sortable": "^5.1.0",
"@dnd-kit/utilities": "^3.0.1",
"@mdi/js": "^5.9.55",
"@mdi/react": "^1.2.1",
"@stripe/react-stripe-js": "^1.2.0",
Expand Down
10 changes: 3 additions & 7 deletions src/cloud/api/teams/docs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export interface CreateDocRequestBody {
template?: string
title?: string
emoji?: string
blocks?: boolean
props?: Record<string, PropData | null>
}

export interface CreateDocResponseBody {
Expand Down Expand Up @@ -117,15 +117,11 @@ export async function updateDocDueDate(docId: string, dueDate: Date | null) {

export async function updateUnsignedDocProps(
docId: string,
props: [string, PropData | null][]
props: Record<string, PropData | null>
) {
const body = {}
props.forEach((prop) => {
body[prop[0]] = prop[1]
})
return callApi<UpdateDocPropsResponseBody>(`api/docs/${docId}/props`, {
method: 'patch',
json: body,
json: props,
})
}

Expand Down
25 changes: 25 additions & 0 deletions src/cloud/api/teams/folders/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,31 @@ export async function updateFolder(
)
return data
}
export interface UpdateFolderEmojiResponseBody {
folder: SerializedFolderWithBookmark
}

export interface UpdateFolderResponseBody {
folders: SerializedFolderWithBookmark[]
docs: SerializedDocWithSupplemental[]
workspaces?: SerializedWorkspace[]
}

export async function updateFolderPageOrder(
folder: SerializedFolder,
moveAheadOf: string
) {
const data = await callApi<UpdateFolderResponseBody>(
`api/teams/${folder.teamId}/folders/${folder.id}/page-order`,
{
json: {
moveAheadOf,
},
method: 'put',
}
)
return data
}

export interface DestroyFolderResponseBody {
parentFolder?: SerializedFolderWithBookmark
Expand Down
1 change: 1 addition & 0 deletions src/cloud/api/teams/props/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type ListPropertySuggestionsRequestBody = {
workspace?: string
doc?: string
folder?: string
smartView?: string
propertyType?: string
jsonPropertyType?: string
}
Expand Down
2 changes: 2 additions & 0 deletions src/cloud/api/teams/tags/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { callApi } from '../../../lib/client'
export interface CreateTagRequestBody {
docId: string
text: string
backgroundColor?: string
}

export interface CreateTagResponseBody {
Expand Down Expand Up @@ -33,6 +34,7 @@ export interface UpdateTagResponseBody {

export interface UpdateTagRequestBody {
text: string
backgroundColor?: string
}

export async function updateTag(
Expand Down
7 changes: 5 additions & 2 deletions src/cloud/api/teams/views/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { callApi } from '../../../lib/client'
import { SerializedView, SupportedViewTypes } from '../../../interfaces/db/view'
import { ViewMoveType } from '../../../lib/views'

export type ListViewsRequestBody =
| {
Expand All @@ -26,6 +27,7 @@ export type CreateViewRequestBody = {
smartView?: string
folder?: string
workspace?: string
name: string
}

export interface CreateViewResponseBody {
Expand All @@ -40,8 +42,9 @@ export async function createView(body: CreateViewRequestBody) {
}

export interface UpdateViewRequestBody {
data: Object
before?: string
name?: string
data?: Object
move?: ViewMoveType
}

export interface UpdateViewResponseBody {
Expand Down
7 changes: 3 additions & 4 deletions src/cloud/components/ContentManager/ContentManagerToolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { LoadingButton } from '../../../design/components/atoms/Button'
import { lngKeys } from '../../lib/i18n/types'
import { useI18n } from '../../lib/hooks/useI18n'
import { useCloudApi } from '../../lib/hooks/useCloudApi'
import DocDueDateSelect from '../Props/Pickers/DueDateSelect'
import DocDueDateSelect from '../Props/Pickers/DatePropPicker'
import DocAssigneeSelect from '../Props/Pickers/AssigneeSelect'
import DocLabelSelectionModal from '../Props/Pickers/DocLabelSelectionModal'
import BulkActionProgress, {
Expand Down Expand Up @@ -558,15 +558,14 @@ const ContentManagerToolbar = ({
<DocDueDateSelect
key={`cm__toolbar--${propColumn.id}`}
emptyLabel={propColumn.name}
dueDate={
date={
selectedDocumentsCommonValues[propColumn.name] != null
? selectedDocumentsCommonValues[propColumn.name].value
: undefined
}
isReadOnly={selectedDocsAreUpdating}
sending={sending === propColumn.name}
shortenedLabel={true}
onDueDateChange={(newDate: Date | null) => {
onDueDateChange={(newDate) => {
updateProp([
propColumn.name,
{
Expand Down
4 changes: 3 additions & 1 deletion src/cloud/components/ContentManager/SortingOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ export const sortingOrders: (FormSelectOption & { icon: React.ReactNode })[] = [
interface SortingOptionProps {
value: typeof sortingOrders[number]['value']
onChange: (value: FormSelectOption) => void
isDisabled?: boolean
}

const SortingOption = ({ value, onChange }: SortingOptionProps) => {
const SortingOption = ({ value, onChange, isDisabled }: SortingOptionProps) => {
const val = sortingOrders.find((ORDER) => ORDER.value === value)
return (
<StyledSortingOption>
Expand All @@ -91,6 +92,7 @@ const SortingOption = ({ value, onChange }: SortingOptionProps) => {
className='sorting-options__select'
isSearchable={false}
isMulti={false}
isDisabled={isDisabled}
/>
</StyledSortingOption>
)
Expand Down
4 changes: 2 additions & 2 deletions src/cloud/components/DashboardPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ import ApplicationTopbar from '../ApplicationTopbar'
import SmartViewFolderContextMenu from '../SmartViewContextMenu'
import CreateSmartViewModal from '../Modal/contents/SmartView/CreateSmartViewModal'
import UpdateSmartViewModal from '../Modal/contents/SmartView/UpdateSmartViewModal'
import Views from '../Views'
import {
getSmartViewListPageData,
SmartViewListPageResponseBody,
} from '../../api/pages/teams/smartViews/list'
import { getDefaultTableView } from '../../lib/views/table'
import { trackEvent } from '../../api/track'
import { MixpanelActionTrackTypes } from '../../interfaces/analytics/mixpanel'
import { ViewsManager } from '../Views'

const SmartViewPage = ({
data,
Expand Down Expand Up @@ -182,7 +182,7 @@ const SmartViewPage = ({
Add filter
</Button>
</Flexbox>
<Views
<ViewsManager
team={team}
views={selectedSmartViewViews}
parent={{ type: 'smartView', target: selectedSmartView }}
Expand Down
Loading