Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

View migration support #430

Merged
merged 3 commits into from
Dec 27, 2024
Merged

View migration support #430

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb5741e
Tweak
lbwexler Dec 27, 2024
e5d97da
Tweak
lbwexler Dec 27, 2024
76bf584
Fix comment.
cnrudd Dec 27, 2024
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
43 changes: 22 additions & 21 deletions grails-app/services/io/xh/hoist/view/ViewService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class ViewService extends BaseService {
/**
* Get all the views, and the current view state for a user
*/
Map getAllData(String type, String viewInstance) {
def blobs = jsonBlobService.list(type).split { it.name == STATE_BLOB_NAME }
Map getAllData(String type, String viewInstance, String username = username) {
def blobs = jsonBlobService.list(type, username).split { it.name == STATE_BLOB_NAME }
def (rawState, views) = [blobs[0], blobs[1]]

// Transform state
Expand All @@ -54,8 +54,8 @@ class ViewService extends BaseService {
}

/** Update state for this user */
void updateState(String type, String viewInstance, Map update) {
def currBlob = jsonBlobService.find(type, STATE_BLOB_NAME, username),
void updateState(String type, String viewInstance, Map update, String username = username) {
def currBlob = jsonBlobService.find(type, STATE_BLOB_NAME, username, username),
currValue = parseObject(currBlob?.value),
newValue = [
currentView: currValue?.currentView ?: [:],
Expand All @@ -67,34 +67,34 @@ class ViewService extends BaseService {
if (update.containsKey('userPinned')) newValue.userPinned = update.userPinned
if (update.containsKey('autoSave')) newValue.autoSave = update.autoSave

jsonBlobService.createOrUpdate(type, STATE_BLOB_NAME, [value: newValue])
jsonBlobService.createOrUpdate(type, STATE_BLOB_NAME, [value: newValue], username)
}

//---------------------------
// Individual View management
//----------------------------
/** Fetch the latest version of a view. */
Map get(String token) {
jsonBlobService.get(token).formatForClient(true)
Map get(String token, String username = username) {
jsonBlobService.get(token, username).formatForClient(true)
}

/** Fetch the latest version of a view. */
Map create(Map data) {
def ret = jsonBlobService.create(
/** Create a new view. */
Map create(Map data, String username = username) {
def ret = jsonBlobService.create([
type: data.type,
name: data.name,
description: data.description,
acl: data.isShared ? '*' : null,
meta: [group: data.group, isShared: data.isShared],
value: data.value
)
], username)
trackChange('Created View', ret)
ret.formatForClient(true)
}

/** Update a views metadata */
Map updateInfo(String token, Map data) {
def existing = jsonBlobService.get(token),
Map updateInfo(String token, Map data, String username = username) {
def existing = jsonBlobService.get(token, username),
existingMeta = parseObject(existing.meta),
isGlobal = existingMeta.isGlobal,
isShared = data.containsKey('isShared') ? data.isShared : existingMeta.isShared;
Expand All @@ -107,38 +107,39 @@ class ViewService extends BaseService {
meta: isGlobal ?
[group: data.group, isDefaultPinned: !!data.isDefaultPinned]:
[group: data.group, isShared: !!data.isShared],
]
],
username
)
trackChange('Updated View Info', ret)
ret.formatForClient(true)
}

/** Update a views value */
Map updateValue(String token, Map value) {
def ret = jsonBlobService.update(token, [value: value]);
Map updateValue(String token, Map value, String username = username) {
def ret = jsonBlobService.update(token, [value: value], username);
if (ret.owner == null) {
trackChange('Updated Global View definition', ret);
}
ret.formatForClient(true)
}

/** Make a view global */
Map makeGlobal(String token) {
def existing = jsonBlobService.get(token),
Map makeGlobal(String token, String username = username) {
def existing = jsonBlobService.get(token, username),
meta = parseObject(existing.meta)?.findAll { it.key != 'isShared' },
ret = jsonBlobService.update(token, [owner: null, acl: '*', meta: meta])
ret = jsonBlobService.update(token, [owner: null, acl: '*', meta: meta], username)

this.trackChange('Made View Global', ret)
ret.formatForClient(true)
}


/** Bulk Delete views */
void delete(List<String> tokens) {
void delete(List<String> tokens, String username = username) {
List<Exception> failures = []
tokens.each {
try {
jsonBlobService.archive(it)
jsonBlobService.archive(it, username)
} catch (Exception e) {
failures << e
logError('Failed to delete View', [token: it], e)
Expand Down
Loading