aa540e73ce
* wip
* Added data migration for populating categories
* wip
* Added data migration for populating categories
* Store WIP
* migration WIP
* category CRUD APIs complete
* category block API WIP
* block category update API done
* Fetcehed data into store
* Started displayting sidebar data
* sidebar WIP
* Dashboard - basic changes
* Sidebar dashboard btn and board switcher UI only
* Sidebar dashboard btn and board switcher UI only
* create category dialog WIP
* Create category webapp side done
* Integrated move card to other category
* board to block
* Disabled dashboard route for now as we'll implement it in phase 2
* WIP
* Added logic to open last board/view on per team level
* Add workspace to teams and boards migrations (#1986)
* Add workspace to teams and boards migrations
* Update json annotations on board models
* boards search dialog WIP
* Seach dialog WIP
* Implemented opening boiard from search results
* Boards switcher styliung
* Handled update category WS event
* Template support
* personal server support and styling fixes
* test fix WIP
* Fixed a bug causing boards to not be moved correctly beteen categories
* Fixed webapp tests
* fix
* Store changes (#2011)
* Permissions phase 1 - Websocket updates (#2014)
* Store changes
* Websockets changes
* Permissions phase 1 - Permissions service (#2015)
* Store changes
* Websockets changes
* Permissions service
* Api and app updates (#2016)
* Store changes
* Websockets changes
* Permissions service
* New API and App changes
* Delete and Patch boards and blocks endpoints
* Used correct variable
* Webapp changes WIP
* Open correct team URL
* Fixed get block API
* Used React context for workspace users
* WIP
* On load navigation sorted out
* WIP
* Nav fix
* categories WS broadcast
* Used real search API
* Fixed unfurl ppreview
* set active team in sidebar
* IMplemented navigation on changing team in sidebar
* Misc fixes
* close rows inside transaction (#2045)
* update syntax for mysql (#2044)
* Upadted mutator for new patchBlock API
* Updated patchBlock API to use new URL
* Listeining to correct event in plugin mode
* Implemented WS messages for category operations:
* Fix duplicated build tags on Makefile
* Sidebar enhancements
* Add missing prefix to SQLite migration and fix flaky tests
* Sidebar boards menu enhancement
* Fix board page interactions (#2144)
* Fix patch board card properties error
* Fix board interactions
* Fix insert blocks interactions
* Fix app tests (#2104)
* Add json1 tag to vscode launch (#2157)
* Fix add, delete and update boards and add board patch generation (#2146)
* Fix update boards and add board patch generation
* Make add board and add template work, as well as deleting a board
* Update the state on board deletion
* Delete unused variable
* Fix bad parenthesis
* Fix board creation inside plugin, options were coming null due websocket message serialization
* update property type mutators to use boards API (#2168)
* Add permissions modal (#2196)
* Initial integration
* Permissions modal, websocket updates and API tests implemented
* Avoid updating/removing user if there is only one admin left
* Fix duplicates on board search
* Adds integration test
* Addressing PR review comments
Co-authored-by: Jesús Espino <jespinog@gmail.com>
* Merge
* I'm able to compile now
* Some fixes around tests execution
* Fixing migrations
* Fixing migrations order
* WIP
* Fixing some other compilation problems on tests
* Some typescript tests fixed
* Fixing javascript tests
* Fixing compilation
* Fixing some problems to create boards
* Load the templates on initial load
* Improvements over initial team templates import
* Adding new fields in the database
* Working on adding duplicate board api
* Removing RootID concept entirely
* Improving a bit the subscriptions
* Fixing store tests for notificationHints
* Fixing more tests
* fixing tests
* Fixing tests
* Fixing tests
* Fixing some small bugs related to templates
* Fixing registration link generation/regeneration
* Fixing cypress tests
* Adding store tests for duplicateBoard and duplicateBlock
* Addressing some TODO comments
* Making the export api simpler
* Add redirect component for old workspace urls
* Removing Dashboard code
* Delete only the built-in templates on update
* fixing tests
* Adding users autocompletion
* Updating snapshots
* Fixing bad merge
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors (#2353)
* fix lint errors
* fix panic when creating new card in notifysubscriptions (#2352)
* fix lint errors
* fix unit test
* Revert "fix unit test"
This reverts commit 0ad78aed65
.
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
* fix sql syntax error for SearchUsersByTeam (#2357)
* Fix mentions delivery (#2358)
* fix sql syntax error for SearchUsersByTeam
* fix mentions delivery
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* update api for octoClient calls, pass correct variables to mutator (#2359)
* Fixing tests after merge
* Fix sidebar context menu UI issue (#2399)
* Fix notification diff for text blocks (#2386)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Permissions branch: Fix card links (#2391)
* fix notification diff for text blocks; fix various linter errors.
* fix URLs to cards
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing sqlite tests
* Fixing server tests
* Update migrations to create global templates. (#2397)
* fix duplicate templates
* revert migrate.go
* update UI for empty templates
* implement updating built-in templates as global (teamId = 0)
* handle error if board not found
* update unit test
* fix more tests
* Update blocks_test.go
Fix merge issue
* fix migration sql error (#2414)
* Fixing frontend tests
* Set target team ID when using a global template (#2419)
* Fix some server tests
* Fixing onboarding creation
* Permissions branch: Fix unit tests and CI errors (part 1) (#2425)
* Fixing some small memory leaks (#2400)
* Fixing some small memory leaks
* fixing tests
* passing the tags to all test targets
* Increasing the timeout of the tests
* Fix some type checkings
* Permissions branch: Fixes all the linter errors (#2429)
* fix linter errors
* Reestructuring the router and splitting in more subcomponents (#2403)
* Reestructuring the router and splitting in more subcomponents
* Removing console.log calls
* Removing unneeded selector
* Addressing PR comment
* Fix redirection to one team when you load directly the boards home path
* Using properly the lastTeamID to redirect the user if needed
* don't allow last admin change/deleted (#2416)
* don't allow last admin change/deleted
* update for i18-extract
* fixed en.json
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
* Splitting BoardPage component into simpler/smaller components (#2435)
* Splitting BoardPage component into simpler/smaller components
* Removing unneeded import
* Replace go migrate with morph permissions (#2424)
* merge origin/replace-go-migrate-with-morph
* run go mod tidy on mattermost-plugin and increase test timeout
* fix merge issue temprorarily
* remove some debug changes
* fixing the linter
* Allow always team 0 (global) templates fetch (#2472)
* Fix problem with viewId 0 in the URL (#2473)
* Migrate from binddata to goembed (#2471)
* Adding join logic to the board switcher (#2434)
* Adding join logic to the board switcher
* Using already existing client function and removing the joinBoard one
* Adding support for autojoin based on url
* Fixing frontend tests
* fix webapp compile error, missing enableSharedBoards (#2501)
* Fixing duplication on postgres
* Adding back views to the sidebar (#2494)
* Fix #2507. Update Swagger comments (#2508)
* Fix the flash of the template selector on board/team switch (#2490)
* Fix the flash of the template selector on board/team switch
* More fixes specially around error handling
* Fixing the bot badge (#2487)
* simplifying a bit the team store sync between channels and focalboard (#2481)
* Fix menu tests (#2528)
* fix failing menu tests
* fix lint error
* Added keyboard shortcut for boards switcher (#2407)
* Added keyboard shortcut for boards switcher
* Fixed a type error
* Added some inline comments
* Fixed lint
* Fixed bug with scroll jumping when the card is opened: (#2477)
- avoid remounting of `ScrollingComponent` for each render of `Kanban` component
- property `autoFocus` set to false for `CalculationOptions` because it triggers `blur` even for the button in Jest tests and closes the menu
- snapshots for tests with `CalculationOptions` updated
* Adding the frontend support for permissions and applying it to a big part of the interface. (#2536)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* Fixing invert behavior
* Permissions branch: No sqlstore calls after app shutdown (#2530)
* fix webapp compile error, missing enableSharedBoards
* refactor app init wip
* - ensure all block change notifications are finished before shutting down app
- fix unit tests for mysql (insert_at only has 1 second resolution!)
* adjust logging
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixed migrations to allow upgrading from previous version (#2535)
* Added mechanism to check if schema migration is needed
* WIP
* WIP
* WIP
* WIP
* Fixed migration
* Fixed for SQLite
* minor cleaniup
* Deleted old schema migration table after running migrations
* Removed a debug log
* Fixed a bug where the code always tried to delete a table which may or may not exist
* Show properly the user avatar in the ShareBoard component (#2542)
* Fixing the last CI problems from the permissions-branch (#2541)
* Fix history ordering
* Giving some times to avoid possible race conditions
* Empty
* Reverting accidental change in the config.json
* Optimizing table view (#2540)
* Optimizing table view
* Reducing the amount of rendering for tables
* Some other performance improvements
* Improve the activeView updates
* Some extra simplifications
* Another small improvement
* Fixing tests
* Fixing linter errors
* Reducing a bit the amount of dependency with big objects in the store
* Small simplification
* Removing Commenter role from the user role selector (#2561)
* Shareboard cleanup (#2550)
* Initial work on permissions gates
* Applying permissions gates in more places
* Adding more checks to the interface
* Adding more permissions gates and keeping the store up to date
* fixing some tests
* Fixing some more tests
* Fixing another test
* Fixing all tests and adding some more
* Adding no-permission snapshot tests
* Addressing PR review comments
* cleanup some shareboard settings
* remove unused property, fix for user items being displayed for non admin
* revert change, allow users to show
Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing comments and cards with the new optimizations in the store (#2560)
* Fixing property creation (#2563)
* Fix user selection in table view (#2565)
* Fixing focus new row in table view (#2567)
* Permissions branch: Fix sqlite table lock (CI) (#2568)
* fix sqlite table lock
* remove test db on teardown
* revert .gitignore
* fix goimport on migration code
* fix typo
* more linter fixes
* clean up tmp db for sqlstore tests
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* Fixing snapshots
* Migrating center panel to functional component (#2562)
* Migrating center panel to functional component
* Fixing some tests
* Fixing another test
* Fixing linter errors
* Fixing types errors
* Fixing linter error
* Fixing cypress tests
* Fixing the last cypress test
* Simpliying a bit the code
* Making property insertion more robust
* Updating checkbox test
Co-authored-by: Harshil Sharma <harshilsharma63@gmail.com>
Co-authored-by: Miguel de la Cruz <miguel@mcrx.me>
Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
Co-authored-by: Chen-I Lim <46905241+chenilim@users.noreply.github.com>
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Harshil Sharma <18575143+harshilsharma63@users.noreply.github.com>
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Co-authored-by: kamre <eremchenko@gmail.com>
245 lines
6.3 KiB
Go
245 lines
6.3 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/mattermost/focalboard/server/utils"
|
|
)
|
|
|
|
var ErrInvalidBoardBlock = errors.New("invalid board block")
|
|
var ErrInvalidPropSchema = errors.New("invalid property schema")
|
|
var ErrInvalidProperty = errors.New("invalid property")
|
|
var ErrInvalidPropertyValue = errors.New("invalid property value")
|
|
var ErrInvalidPropertyValueType = errors.New("invalid property value type")
|
|
var ErrInvalidDate = errors.New("invalid date property")
|
|
|
|
// PropValueResolver allows PropDef.GetValue to further decode property values, such as
|
|
// looking up usernames from ids.
|
|
type PropValueResolver interface {
|
|
GetUserByID(userID string) (*User, error)
|
|
}
|
|
|
|
// BlockProperties is a map of Prop's keyed by property id.
|
|
type BlockProperties map[string]BlockProp
|
|
|
|
// BlockProp represent a property attached to a block (typically a card).
|
|
type BlockProp struct {
|
|
ID string `json:"id"`
|
|
Index int `json:"index"`
|
|
Name string `json:"name"`
|
|
Value string `json:"value"`
|
|
}
|
|
|
|
// PropSchema is a map of PropDef's keyed by property id.
|
|
type PropSchema map[string]PropDef
|
|
|
|
// PropDefOption represents an option within a property definition.
|
|
type PropDefOption struct {
|
|
ID string `json:"id"`
|
|
Index int `json:"index"`
|
|
Color string `json:"color"`
|
|
Value string `json:"value"`
|
|
}
|
|
|
|
// PropDef represents a property definition as defined in a board's Fields member.
|
|
type PropDef struct {
|
|
ID string `json:"id"`
|
|
Index int `json:"index"`
|
|
Name string `json:"name"`
|
|
Type string `json:"type"`
|
|
Options map[string]PropDefOption `json:"options"`
|
|
}
|
|
|
|
// GetValue resolves the value of a property if the passed value is an ID for an option,
|
|
// otherwise returns the original value.
|
|
func (pd PropDef) GetValue(v interface{}, resolver PropValueResolver) (string, error) {
|
|
switch pd.Type {
|
|
case "select":
|
|
// v is the id of an option
|
|
id, ok := v.(string)
|
|
if !ok {
|
|
return "", ErrInvalidPropertyValueType
|
|
}
|
|
opt, ok := pd.Options[id]
|
|
if !ok {
|
|
return "", ErrInvalidPropertyValue
|
|
}
|
|
return strings.ToUpper(opt.Value), nil
|
|
|
|
case "date":
|
|
// v is a JSON string
|
|
date, ok := v.(string)
|
|
if !ok {
|
|
return "", ErrInvalidPropertyValueType
|
|
}
|
|
return pd.ParseDate(date)
|
|
|
|
case "person":
|
|
// v is a userid
|
|
userID, ok := v.(string)
|
|
if !ok {
|
|
return "", ErrInvalidPropertyValueType
|
|
}
|
|
if resolver != nil {
|
|
user, err := resolver.GetUserByID(userID)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if user == nil {
|
|
return userID, nil
|
|
}
|
|
return user.Username, nil
|
|
}
|
|
return userID, nil
|
|
|
|
case "multiSelect":
|
|
// v is a slice of strings containing option ids
|
|
ms, ok := v.([]interface{})
|
|
if !ok {
|
|
return "", ErrInvalidPropertyValueType
|
|
}
|
|
var sb strings.Builder
|
|
prefix := ""
|
|
for _, optid := range ms {
|
|
id, ok := optid.(string)
|
|
if !ok {
|
|
return "", ErrInvalidPropertyValueType
|
|
}
|
|
opt, ok := pd.Options[id]
|
|
if !ok {
|
|
return "", ErrInvalidPropertyValue
|
|
}
|
|
sb.WriteString(prefix)
|
|
prefix = ", "
|
|
sb.WriteString(strings.ToUpper(opt.Value))
|
|
}
|
|
return sb.String(), nil
|
|
}
|
|
return fmt.Sprintf("%v", v), nil
|
|
}
|
|
|
|
func (pd PropDef) ParseDate(s string) (string, error) {
|
|
// s is a JSON snippet of the form: {"from":1642161600000, "to":1642161600000} in milliseconds UTC
|
|
// The UI does not yet support date ranges.
|
|
var m map[string]int64
|
|
if err := json.Unmarshal([]byte(s), &m); err != nil {
|
|
return s, err
|
|
}
|
|
tsFrom, ok := m["from"]
|
|
if !ok {
|
|
return s, ErrInvalidDate
|
|
}
|
|
date := utils.GetTimeForMillis(tsFrom).Format("January 02, 2006")
|
|
tsTo, ok := m["to"]
|
|
if ok {
|
|
date += " -> " + utils.GetTimeForMillis(tsTo).Format("January 02, 2006")
|
|
}
|
|
return date, nil
|
|
}
|
|
|
|
// ParsePropertySchema parses a board block's `Fields` to extract the properties
|
|
// schema for all cards within the board.
|
|
// The result is provided as a map for quick lookup, and the original order is
|
|
// preserved via the `Index` field.
|
|
func ParsePropertySchema(board *Board) (PropSchema, error) {
|
|
schema := make(map[string]PropDef)
|
|
|
|
for i, prop := range board.CardProperties {
|
|
pd := PropDef{
|
|
ID: getMapString("id", prop),
|
|
Index: i,
|
|
Name: getMapString("name", prop),
|
|
Type: getMapString("type", prop),
|
|
Options: make(map[string]PropDefOption),
|
|
}
|
|
optsIface, ok := prop["options"]
|
|
if ok {
|
|
opts, ok := optsIface.([]interface{})
|
|
if !ok {
|
|
return nil, ErrInvalidPropSchema
|
|
}
|
|
for j, propOptIface := range opts {
|
|
propOpt, ok := propOptIface.(map[string]interface{})
|
|
if !ok {
|
|
return nil, ErrInvalidPropSchema
|
|
}
|
|
po := PropDefOption{
|
|
ID: getMapString("id", propOpt),
|
|
Index: j,
|
|
Value: getMapString("value", propOpt),
|
|
Color: getMapString("color", propOpt),
|
|
}
|
|
pd.Options[po.ID] = po
|
|
}
|
|
}
|
|
schema[pd.ID] = pd
|
|
}
|
|
return schema, nil
|
|
}
|
|
|
|
func getMapString(key string, m map[string]interface{}) string {
|
|
iface, ok := m[key]
|
|
if !ok {
|
|
return ""
|
|
}
|
|
|
|
s, ok := iface.(string)
|
|
if !ok {
|
|
return ""
|
|
}
|
|
return s
|
|
}
|
|
|
|
// ParseProperties parses a block's `Fields` to extract the properties. Properties typically exist on
|
|
// card blocks. A resolver can optionally be provided to fetch usernames for `person` prop type.
|
|
func ParseProperties(block *Block, schema PropSchema, resolver PropValueResolver) (BlockProperties, error) {
|
|
props := make(map[string]BlockProp)
|
|
|
|
if block == nil {
|
|
return props, nil
|
|
}
|
|
|
|
// `properties` contains a map (untyped at this point).
|
|
propsIface, ok := block.Fields["properties"]
|
|
if !ok {
|
|
return props, nil // this is expected for blocks that don't have any properties.
|
|
}
|
|
|
|
blockProps, ok := propsIface.(map[string]interface{})
|
|
if !ok {
|
|
return props, fmt.Errorf("`properties` field wrong type: %w", ErrInvalidProperty)
|
|
}
|
|
|
|
if len(blockProps) == 0 {
|
|
return props, nil
|
|
}
|
|
|
|
for k, v := range blockProps {
|
|
s := fmt.Sprintf("%v", v)
|
|
|
|
prop := BlockProp{
|
|
ID: k,
|
|
Name: k,
|
|
Value: s,
|
|
}
|
|
|
|
def, ok := schema[k]
|
|
if ok {
|
|
val, err := def.GetValue(v, resolver)
|
|
if err != nil {
|
|
return props, fmt.Errorf("could not parse property value (%s): %w", fmt.Sprintf("%v", v), err)
|
|
}
|
|
prop.Name = def.Name
|
|
prop.Value = val
|
|
prop.Index = def.Index
|
|
}
|
|
props[k] = prop
|
|
}
|
|
return props, nil
|
|
}
|