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>
364 lines
9.6 KiB
Go
364 lines
9.6 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package notifysubscriptions
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
|
|
"github.com/mattermost/focalboard/server/model"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/shared/mlog"
|
|
)
|
|
|
|
// Diff represents a difference between two versions of a block.
|
|
type Diff struct {
|
|
Board *model.Board
|
|
Card *model.Block
|
|
Authors StringMap
|
|
|
|
BlockType model.BlockType
|
|
OldBlock *model.Block
|
|
NewBlock *model.Block
|
|
|
|
UpdateAt int64 // the UpdateAt of the latest version of the block
|
|
|
|
schemaDiffs []SchemaDiff
|
|
PropDiffs []PropDiff
|
|
|
|
Diffs []*Diff // Diffs for child blocks
|
|
}
|
|
|
|
type PropDiff struct {
|
|
ID string // property id
|
|
Index int
|
|
Name string
|
|
OldValue string
|
|
NewValue string
|
|
}
|
|
|
|
type SchemaDiff struct {
|
|
Board *model.Board
|
|
|
|
OldPropDef *model.PropDef
|
|
NewPropDef *model.PropDef
|
|
}
|
|
|
|
type diffGenerator struct {
|
|
board *model.Board
|
|
card *model.Block
|
|
|
|
store Store
|
|
hint *model.NotificationHint
|
|
lastNotifyAt int64
|
|
logger *mlog.Logger
|
|
}
|
|
|
|
func (dg *diffGenerator) generateDiffs() ([]*Diff, error) {
|
|
// use block_history to fetch blocks in case they were deleted and no longer exist in blocks table.
|
|
opts := model.QueryBlockHistoryOptions{
|
|
Limit: 1,
|
|
Descending: true,
|
|
}
|
|
blocks, err := dg.store.GetBlockHistory(dg.hint.BlockID, opts)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not get block for notification: %w", err)
|
|
}
|
|
if len(blocks) == 0 {
|
|
return nil, fmt.Errorf("block not found for notification: %w", err)
|
|
}
|
|
block := &blocks[0]
|
|
|
|
if dg.board == nil || dg.card == nil {
|
|
return nil, fmt.Errorf("cannot generate diff for block %s; must have a valid board and card: %w", dg.hint.BlockID, err)
|
|
}
|
|
|
|
// parse board's property schema here so it only happens once.
|
|
schema, err := model.ParsePropertySchema(dg.board)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not parse property schema for board %s: %w", dg.board.ID, err)
|
|
}
|
|
|
|
switch block.Type {
|
|
case model.TypeBoard:
|
|
dg.logger.Warn("generateDiffs for board skipped", mlog.String("block_id", block.ID))
|
|
// TODO: Fix this
|
|
// return dg.generateDiffsForBoard(block, schema)
|
|
return nil, nil
|
|
case model.TypeCard:
|
|
diff, err := dg.generateDiffsForCard(block, schema)
|
|
if err != nil || diff == nil {
|
|
return nil, err
|
|
}
|
|
return []*Diff{diff}, nil
|
|
default:
|
|
diff, err := dg.generateDiffForBlock(block, schema)
|
|
if err != nil || diff == nil {
|
|
return nil, err
|
|
}
|
|
return []*Diff{diff}, nil
|
|
}
|
|
}
|
|
|
|
// TODO: fix this
|
|
/*
|
|
func (dg *diffGenerator) generateDiffsForBoard(board *model.Board, schema model.PropSchema) ([]*Diff, error) {
|
|
opts := model.QuerySubtreeOptions{
|
|
AfterUpdateAt: dg.lastNotifyAt,
|
|
}
|
|
|
|
find all child blocks of the board that updated since last notify.
|
|
blocks, err := dg.store.GetSubTree2(board.ID, board.ID, opts)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not get subtree for board %s: %w", board.ID, err)
|
|
}
|
|
|
|
var diffs []*Diff
|
|
|
|
generate diff for board title change or description
|
|
boardDiff, err := dg.generateDiffForBlock(board, schema)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not generate diff for board %s: %w", board.ID, err)
|
|
}
|
|
|
|
if boardDiff != nil {
|
|
TODO: phase 2 feature (generate schema diffs and add to board diff) goes here.
|
|
diffs = append(diffs, boardDiff)
|
|
}
|
|
|
|
for _, b := range blocks {
|
|
block := b
|
|
if block.Type == model.TypeCard {
|
|
cardDiffs, err := dg.generateDiffsForCard(&block, schema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
diffs = append(diffs, cardDiffs)
|
|
}
|
|
}
|
|
return diffs, nil
|
|
}
|
|
*/
|
|
|
|
func (dg *diffGenerator) generateDiffsForCard(card *model.Block, schema model.PropSchema) (*Diff, error) {
|
|
// generate diff for card title change and properties.
|
|
cardDiff, err := dg.generateDiffForBlock(card, schema)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not generate diff for card %s: %w", card.ID, err)
|
|
}
|
|
|
|
// fetch all card content blocks that were updated after last notify
|
|
opts := model.QuerySubtreeOptions{
|
|
AfterUpdateAt: dg.lastNotifyAt,
|
|
}
|
|
blocks, err := dg.store.GetSubTree2(card.BoardID, card.ID, opts)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not get subtree for card %s: %w", card.ID, err)
|
|
}
|
|
|
|
authors := make(StringMap)
|
|
|
|
// walk child blocks
|
|
var childDiffs []*Diff
|
|
for i := range blocks {
|
|
if blocks[i].ID == card.ID {
|
|
continue
|
|
}
|
|
|
|
blockDiff, err := dg.generateDiffForBlock(&blocks[i], schema)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not generate diff for block %s: %w", blocks[i].ID, err)
|
|
}
|
|
if blockDiff != nil {
|
|
childDiffs = append(childDiffs, blockDiff)
|
|
authors.Append(blockDiff.Authors)
|
|
}
|
|
}
|
|
|
|
dg.logger.Debug("generateDiffsForCard",
|
|
mlog.Bool("has_top_changes", cardDiff != nil),
|
|
mlog.Int("subtree", len(blocks)),
|
|
mlog.Array("author_names", authors.Values()),
|
|
mlog.Int("child_diffs", len(childDiffs)),
|
|
)
|
|
|
|
if len(childDiffs) != 0 {
|
|
if cardDiff == nil { // will be nil if the card has no other changes besides child diffs
|
|
cardDiff = &Diff{
|
|
Board: dg.board,
|
|
Card: card,
|
|
Authors: make(StringMap),
|
|
BlockType: card.Type,
|
|
OldBlock: card,
|
|
NewBlock: card,
|
|
UpdateAt: card.UpdateAt,
|
|
PropDiffs: nil,
|
|
schemaDiffs: nil,
|
|
}
|
|
}
|
|
cardDiff.Diffs = childDiffs
|
|
}
|
|
cardDiff.Authors.Append(authors)
|
|
|
|
return cardDiff, nil
|
|
}
|
|
|
|
func (dg *diffGenerator) generateDiffForBlock(newBlock *model.Block, schema model.PropSchema) (*Diff, error) {
|
|
dg.logger.Debug("generateDiffForBlock - new block",
|
|
mlog.String("block_id", newBlock.ID),
|
|
mlog.String("block_type", string(newBlock.Type)),
|
|
mlog.String("modified_by", newBlock.ModifiedBy),
|
|
mlog.Int64("update_at", newBlock.UpdateAt),
|
|
)
|
|
|
|
// find the version of the block as it was at the time of last notify.
|
|
opts := model.QueryBlockHistoryOptions{
|
|
BeforeUpdateAt: dg.lastNotifyAt + 1,
|
|
Limit: 1,
|
|
Descending: true,
|
|
}
|
|
history, err := dg.store.GetBlockHistory(newBlock.ID, opts)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not get block history for block %s: %w", newBlock.ID, err)
|
|
}
|
|
|
|
var oldBlock *model.Block
|
|
if len(history) != 0 {
|
|
oldBlock = &history[0]
|
|
|
|
dg.logger.Debug("generateDiffForBlock - old block",
|
|
mlog.String("block_id", oldBlock.ID),
|
|
mlog.String("block_type", string(oldBlock.Type)),
|
|
mlog.Int64("before_update_at", dg.lastNotifyAt),
|
|
mlog.String("modified_by", oldBlock.ModifiedBy),
|
|
mlog.Int64("update_at", oldBlock.UpdateAt),
|
|
)
|
|
}
|
|
|
|
// find all the versions of the blocks that changed so we can gather all the author usernames.
|
|
opts = model.QueryBlockHistoryOptions{
|
|
AfterUpdateAt: dg.lastNotifyAt,
|
|
Descending: true,
|
|
}
|
|
chgBlocks, err := dg.store.GetBlockHistory(newBlock.ID, opts)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting block history for block %s: %w", newBlock.ID, err)
|
|
}
|
|
authors := make(StringMap)
|
|
|
|
dg.logger.Debug("generateDiffForBlock - authors",
|
|
mlog.Int64("after_update_at", dg.lastNotifyAt),
|
|
mlog.Int("history_count", len(chgBlocks)),
|
|
)
|
|
|
|
// have to loop through history slice because GetBlockHistory does not return pointers.
|
|
for _, b := range chgBlocks {
|
|
user, err := dg.store.GetUserByID(b.ModifiedBy)
|
|
if err != nil || user == nil {
|
|
dg.logger.Error("could not fetch username for block",
|
|
mlog.String("modified_by", b.ModifiedBy),
|
|
mlog.Err(err),
|
|
)
|
|
authors.Add(b.ModifiedBy, "unknown_user") // todo: localize this when server has i18n
|
|
} else {
|
|
authors.Add(user.ID, user.Username)
|
|
}
|
|
}
|
|
|
|
propDiffs := dg.generatePropDiffs(oldBlock, newBlock, schema)
|
|
|
|
dg.logger.Debug("generateDiffForBlock - results",
|
|
mlog.String("block_id", newBlock.ID),
|
|
mlog.String("block_type", string(newBlock.Type)),
|
|
mlog.Array("author_names", authors.Values()),
|
|
mlog.Int("history_count", len(history)),
|
|
mlog.Int("prop_diff_count", len(propDiffs)),
|
|
)
|
|
|
|
diff := &Diff{
|
|
Board: dg.board,
|
|
Card: dg.card,
|
|
Authors: authors,
|
|
BlockType: newBlock.Type,
|
|
OldBlock: oldBlock,
|
|
NewBlock: newBlock,
|
|
UpdateAt: newBlock.UpdateAt,
|
|
PropDiffs: propDiffs,
|
|
schemaDiffs: nil,
|
|
}
|
|
return diff, nil
|
|
}
|
|
|
|
func (dg *diffGenerator) generatePropDiffs(oldBlock, newBlock *model.Block, schema model.PropSchema) []PropDiff {
|
|
var propDiffs []PropDiff
|
|
|
|
oldProps, err := model.ParseProperties(oldBlock, schema, dg.store)
|
|
if err != nil {
|
|
dg.logger.Error("Cannot parse properties for old block",
|
|
mlog.String("block_id", oldBlock.ID),
|
|
mlog.Err(err),
|
|
)
|
|
}
|
|
|
|
newProps, err := model.ParseProperties(newBlock, schema, dg.store)
|
|
if err != nil {
|
|
dg.logger.Error("Cannot parse properties for new block",
|
|
mlog.String("block_id", oldBlock.ID),
|
|
mlog.Err(err),
|
|
)
|
|
}
|
|
|
|
// look for new or changed properties.
|
|
for k, prop := range newProps {
|
|
oldP, ok := oldProps[k]
|
|
if ok {
|
|
// prop changed
|
|
if prop.Value != oldP.Value {
|
|
propDiffs = append(propDiffs, PropDiff{
|
|
ID: prop.ID,
|
|
Index: prop.Index,
|
|
Name: prop.Name,
|
|
NewValue: prop.Value,
|
|
OldValue: oldP.Value,
|
|
})
|
|
}
|
|
} else {
|
|
// prop added
|
|
propDiffs = append(propDiffs, PropDiff{
|
|
ID: prop.ID,
|
|
Index: prop.Index,
|
|
Name: prop.Name,
|
|
NewValue: prop.Value,
|
|
OldValue: "",
|
|
})
|
|
}
|
|
}
|
|
|
|
// look for deleted properties
|
|
for k, prop := range oldProps {
|
|
_, ok := newProps[k]
|
|
if !ok {
|
|
// prop deleted
|
|
propDiffs = append(propDiffs, PropDiff{
|
|
ID: prop.ID,
|
|
Index: prop.Index,
|
|
Name: prop.Name,
|
|
NewValue: "",
|
|
OldValue: prop.Value,
|
|
})
|
|
}
|
|
}
|
|
return sortPropDiffs(propDiffs)
|
|
}
|
|
|
|
func sortPropDiffs(propDiffs []PropDiff) []PropDiff {
|
|
if len(propDiffs) == 0 {
|
|
return propDiffs
|
|
}
|
|
|
|
sort.Slice(propDiffs, func(i, j int) bool {
|
|
return propDiffs[i].Index < propDiffs[j].Index
|
|
})
|
|
return propDiffs
|
|
}
|