Rename worker clusters to tags #104223
No reviewers
Labels
No Label
Good First Issue
Priority
High
Priority
Low
Priority
Normal
Status
Archived
Status
Confirmed
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Job Type
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: studio/flamenco#104223
Loading…
Reference in New Issue
Block a user
No description provided.
Delete Branch "Evelinealy/flamenco:worker-tag-rename"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
As it was decided that the name "tags" would be better for the clarity of the feature, all files and code named "cluster" or "worker cluster" have been removed and replaced with "tag" and "worker tag". This is only a name change, no other features were touched.
This fixes part of #104204; there's more to implement though.
To convert the database from 'clusters' to 'tags', run the following two SQL statements:
worker-tag-renameto Fix #104204: Rename worker clusters to tagsFix #104204: Rename worker clusters to tagsto Rename worker clusters to tagsPlease do test that the functionality still works -- the unit tests only cover part of it.
When assigning a tag to a worker, I'm getting this JS error:
To get a better one, you can use the frontend dev server (
cd web/app; yarn run
IIRC, but the readme/docs will have more on this) to get non-minified JS to help debug this.Rename worker clusters to tagsto WIP: Rename worker clusters to tagsWIP: Rename worker clusters to tagsto Rename worker clusters to tagsApologies for the redundant commits. There was a bit of an issue I was trying to work around with the git errors. Anyways, I fix the WorkerDetails.vue file, so please let me know if this changes the bug on your end. Thank you!
There is one more area in which clusters is mentioned, and that is the
273-0d96b20d.chunk.min.js
file in theflamenco/web/project-website/themes/hugo-geekdoc/static/js
. Is that a simple generated file? I can edit that one as well, but I'm not sure if it will be changed anyways because of it being generated.The individual commits in a PR are the last thing I'd look at. It's just a side-effect of an actual human doing stuff. Commits can be squashed, torn apart, played with. And that's one of the last things to look into before actually landing the PR.
That's 3rd party code of Geekdoc (our Hugo theme), it shouldn't be altered for this.
🥳 that last JS error is fixed indeed, and I can confirm that everything seems to be working fine now.
There's just two things left:
origin/main
. I've had this before, it can because by accidentally usingmain
instead oforigin/main
when merging. No big deal, we can remove those changes before landing the PR. I've left a note at the places where this happened.@ -13,3 +13,3 @@
- Add support for finding the top-level 'project' directory. When submitting files to Flamenco, the add-on will try to retain the directory structure of your Blender project as precisely as possible. This new feature allows the add-on to find the top-level directory of your project by finding a `.blender_project`, `.git`, or `.subversion` directory. This can be configured in the add-on preferences.
- Worker status is remembered when they sign off, so that workers when they come back online do so to the same state ([#99549](https://projects.blender.org/studio/flamenco/issues/99549)).
- Nicer version display for non-release builds. Instead of `3.3-alpha0-v3.2-76-gdd34d538`, show `3.3-alpha0 (v3.2-76-gdd34d538)`.
Be sure to merge
origin/main
carefully. It seems that certain changes there got reverted. I can also help with this if you want.@ -371,3 +371,3 @@
func logURLs(urls []url.URL) {
log.Info().Int("count", len(urls)).Msg("possible URLs at which to reach Flamenco Manager")
log.Info().Int("count", len(urls)).Msg("possble URL at which to reach Flamenco Manager")
This is another change in
main
that got reverted here.@ -14,3 +14,2 @@
github.com/getkin/kin-openapi v0.88.0
github.com/glebarez/go-sqlite v1.21.1
github.com/glebarez/sqlite v1.8.0
github.com/glebarez/go-sqlite v1.17.3
This is another change in
main
that got reverted here.@ -45,3 +45,3 @@
return ApplicationVersion
default:
return fmt.Sprintf("%s (%s)", ApplicationVersion, ApplicationGitHash)
return fmt.Sprintf("%s-%s", ApplicationVersion, ApplicationGitHash)
This is another change in
main
that got reverted here.@ -26,7 +26,6 @@ func (f *Flamenco) GetVersion(e echo.Context) error {
Version: appinfo.ExtendedVersion(),
Shortversion: appinfo.ApplicationVersion,
Name: appinfo.ApplicationName,
Git: appinfo.ApplicationGitHash,
This is another change in
main
that got reverted here.@ -82,3 +82,3 @@
defer cancel()
startTime := time.Date(2023, time.February, 7, 15, 0, 0, 0, time.UTC)
startTime := time.Date(2023, time.February, 7, 15, 0, 0, 0, time.Local)
This is another change in
main
that got reverted here.@ -36,3 +28,1 @@
// sqlErr, ok := err.(*sqlite.Error)
// return ok && sqlErr.Code() == sqlite_lib.SQLITE_BUSY
return strings.Contains(err.Error(), "SQLITE_BUSY")
sqlErr, ok := err.(*sqlite.Error)
This is another change in
main
that got reverted here.@ -91,3 +91,3 @@
// file-management
"move-directory": ce.cmdMoveDirectory,
"copy-file": ce.cmdCopyFile,
"copy-file": ce.cmdCopyFile,
This is a formatting change that should indeed be applied, but shouldn't be part of this PR. Same for the other formatting changes in the
command_...go
files.@ -1340,3 +1337,1 @@
Version of this Manager, meant for human consumption. For release
builds it is the same as `shortversion`, for other builds it also
includes the `git` version info.
"version": { type: string }
This is another change in
main
that got reverted here.@ -5,3 +5,3 @@
<dl>
<dt class="field-id">ID</dt>
<dd><span @click="copyElementText" class="click-to-copy">{{ workerData.id }}</span></dd>
<dd>
These formatting changes don't relate to this PR, so they shouldn't be in here.
@ -138,3 +188,2 @@
<script>
import { useNotifs } from '@/stores/notifications'
import { useWorkers } from '@/stores/workers'
import { useNotifs } from "@/stores/notifications";
These are also formatting changes that shouldn't be in here.
@ -8,9 +8,6 @@ next to the `flamenco-manager` executable. The previous chapters
([Shared Storage][storage] and [Variables][variables]) also described parts of
that configuration file.
[storage]: {{< ref "shared-storage" >}}
This is another change in
main
that got reverted here.ab06eb4d31
to9ec341ab39
I generated the code to make sure it came up okay, and used git reset + forced the push. I'm really hoping this works, please let me know!
Please take a look at the Files Changed tab. That shows that the generated Python files have been deleted. I'll regenerate them (with
make generate
) before testing the PR.It works, well done :)
I'll land this PR in
main
, it'll automatically delete yourworker-tag-rename
branch as well. To see that branch removal locally on your machine as well, dogit fetch origin --prune
.