- Clusters
+
@@ -140,7 +143,7 @@ import { useNotifs } from '@/stores/notifications'
import { useWorkers } from '@/stores/workers'
import * as datetime from "@/datetime";
-import { WorkerMgtApi, WorkerSleepSchedule, WorkerClusterChangeRequest } from '@/manager-api';
+import { WorkerMgtApi, WorkerSleepSchedule, WorkerTagChangeRequest } from "@/manager-api";
import { getAPIClient } from "@/api-client";
import { workerStatus } from "../../statusindicator";
import LinkWorkerTask from '@/components/LinkWorkerTask.vue';
@@ -165,18 +168,17 @@ export default {
notifs: useNotifs(),
copyElementText: copyElementText,
workers: useWorkers(),
- thisWorkerClusters: {}, // Mapping from UUID to 'isAssigned' boolean.
+ thisWorkerTags: {}, // Mapping from UUID to 'isAssigned' boolean.
};
},
mounted() {
// Allow testing from the JS console:
window.workerDetailsVue = this;
- this.workers.refreshClusters()
- .catch((error) => {
- const errorMsg = JSON.stringify(error); // TODO: handle API errors better.
- this.notifs.add(`Error: ${errorMsg}`);
- });
+ this.workers.refreshTags().catch((error) => {
+ const errorMsg = JSON.stringify(error); // TODO: handle API errors better.
+ this.notifs.add(`Error: ${errorMsg}`);
+ });
},
watch: {
workerData(newData, oldData) {
@@ -191,7 +193,7 @@ export default {
this.fetchWorkerSleepSchedule();
}
- this.updateThisWorkerClusters(newData);
+ this.updateThisWorkerTags(newData);
},
},
computed: {
@@ -210,10 +212,10 @@ export default {
workerSleepScheduleStatusLabel() {
return this.workerSleepSchedule.is_active ? 'Enabled' : 'Disabled';
},
- hasClustersAssigned() {
- const clusterIDs = this.getAssignedClusterIDs();
- return clusterIDs && clusterIDs.length > 0;
- }
+ hasTagsAssigned() {
+ const tagIDs = this.getAssignedTagIDs();
+ return tagIDs && tagIDs.length > 0;
+ },
},
methods: {
fetchWorkerSleepSchedule() {
@@ -262,46 +264,48 @@ export default {
}
this.api.deleteWorker(this.workerData.id);
},
- updateThisWorkerClusters(newWorkerData) {
- if (!newWorkerData || !newWorkerData.clusters) {
- this.thisWorkerClusters = {};
+ updateThisWorkerTags(newWorkerData) {
+ if (!newWorkerData || !newWorkerData.tags) {
+ this.thisWorkerTags = {};
return;
}
- const assignedClusters = newWorkerData.clusters.reduce(
- (accu, cluster) => { accu[cluster.id] = true; return accu; },
- {});
- this.thisWorkerClusters = assignedClusters;
+ const assignedTags = newWorkerData.tags.reduce((accu, tag) => {
+ accu[tag.id] = true;
+ return accu;
+ }, {});
+ this.thisWorkerTags = assignedTags;
},
- toggleWorkerCluster(clusterID) {
- console.log("Toggled", clusterID);
- this.thisWorkerClusters[clusterID] = !this.thisWorkerClusters[clusterID];
- console.log("New assignment:", plain(this.thisWorkerClusters))
+ toggleWorkerTag(tagID) {
+ console.log("Toggled", tagID);
+ this.thisWorkerTags[tagID] = !this.thisWorkerTags[tagID];
+ console.log("New assignment:", plain(this.thisWorkerTags));
- // Construct cluster change request.
- const clusterIDs = this.getAssignedClusterIDs();
- const changeRequest = new WorkerClusterChangeRequest(clusterIDs);
+ // Construct tag change request.
+ const tagIDs = this.getAssignedTagIDs();
+ const changeRequest = new WorkerTagChangeRequest(tagIDs);
// Send to the Manager.
- this.api.setWorkerClusters(this.workerData.id, changeRequest)
+ this.api
+ .setWorkerTags(this.workerData.id, changeRequest)
.then(() => {
- this.notifs.add('Cluster assignment updated');
+ this.notifs.add("Tag assignment updated");
})
.catch((error) => {
const errorMsg = JSON.stringify(error); // TODO: handle API errors better.
this.notifs.add(`Error: ${errorMsg}`);
});
},
- getAssignedClusterIDs() {
- const clusterIDs = [];
- for (let clusterID in this.thisWorkerClusters) {
+ getAssignedTagIDs() {
+ const tagIDs = [];
+ for (let tagID in this.thisWorkerTags) {
// Values can exist and be set to 'false'.
- const isAssigned = this.thisWorkerClusters[clusterID];
- if (isAssigned) clusterIDs.push(clusterID);
+ const isAssigned = this.thisWorkerTags[tagID];
+ if (isAssigned) tagIDs.push(tagID);
}
- return clusterIDs;
- }
- }
+ return tagIDs;
+ },
+ },
};
@@ -377,11 +381,11 @@ export default {
white-space: nowrap;
}
-.worker-clusters ul {
+.worker-tags ul {
list-style: none;
}
-.worker-clusters ul li {
+.worker-tags ul li {
margin-bottom: 0.25rem;
}
diff --git a/web/app/src/stores/workers.js b/web/app/src/stores/workers.js
index 5e3e82d0..cc64bda8 100644
--- a/web/app/src/stores/workers.js
+++ b/web/app/src/stores/workers.js
@@ -15,16 +15,16 @@ export const useWorkers = defineStore('workers', {
*/
activeWorkerID: "",
- /** @type {API.WorkerCluster[]} */
- clusters: [],
+ /** @type {API.WorkerTag[]} */
+ tags: [],
- /* Mapping from cluster UUID to API.WorkerCluster. */
- clustersByID: {},
+ /* Mapping from tag UUID to API.WorkerTag. */
+ tagsByID: {},
}),
actions: {
setActiveWorkerID(workerID) {
this.$patch({
- activeWorker: {id: workerID, settings: {}, metadata: {}},
+ activeWorker: { id: workerID, settings: {}, metadata: {} },
activeWorkerID: workerID,
});
},
@@ -47,22 +47,21 @@ export const useWorkers = defineStore('workers', {
});
},
/**
- * Fetch the available worker clusters from the Manager.
+ * Fetch the available worker tags from the Manager.
*
* @returns a promise.
*/
- refreshClusters() {
+ refreshTags() {
const api = new WorkerMgtApi(getAPIClient());
- return api.fetchWorkerClusters()
- .then((resp) => {
- this.clusters = resp.clusters;
+ return api.fetchWorkerTags().then((resp) => {
+ this.tags = resp.tags;
- let clustersByID = {};
- for (let cluster of this.clusters) {
- clustersByID[cluster.id] = cluster;
- }
- this.clustersByID = clustersByID;
- })
+ let tagsByID = {};
+ for (let tag of this.tags) {
+ tagsByID[tag.id] = tag;
+ }
+ this.tagsByID = tagsByID;
+ });
},
},
-})
+});