Skip to content

Remove Vuex, use Composables #1649

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

Merged
BryonLewis merged 2 commits into from
May 14, 2026
Merged

Remove Vuex, use Composables #1649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fcb479
remove vuex dependency, use composables
BryonLewis May 14, 2026
04a238a
adding tests
BryonLewis May 14, 2026
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
12 changes: 6 additions & 6 deletions client/dive-common/components/Attributes/AttributeValueColors.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!-- eslint-disable max-len -->
<script lang="ts">
import {
defineComponent, ref, PropType, Ref,
defineComponent, ref, PropType, Ref, computed,
} from 'vue';
import { useStore } from 'platform/web-girder/store/types';
import { useUser } from 'platform/web-girder/store/useUser';
import { StringKeyObject } from 'vue-media-annotator/BaseAnnotation';
import { useCameraStore, useTrackStyleManager } from 'vue-media-annotator/provides';
import { Attribute } from 'vue-media-annotator/use/AttributeTypes';
Expand All @@ -20,8 +20,8 @@ export default defineComponent({
setup(props, { emit }) {
const typeStylingRef = useTrackStyleManager().typeStyling;
const cameraStore = useCameraStore();
const store = useStore();
const user = (store.state.User.user?.login || '') as string;
const { user } = useUser();
const userLogin = computed(() => user.value?.login || '');

const predeterminedValues = ref(props.attribute.values || []);

Expand All @@ -39,7 +39,7 @@ export default defineComponent({
if (!props.attribute.user && track.attributes[props.attribute.name]) {
valueMap[track.attributes[props.attribute.name] as string] = true;
} else if (props.attribute.user && track.attributes.userAttributes) {
const userAttr = (track.attributes.userAttributes[user]) as StringKeyObject;
const userAttr = (track.attributes.userAttributes[userLogin.value]) as StringKeyObject;
if (userAttr[props.attribute.name]) {
valueMap[userAttr[props.attribute.name] as string] = true;
}
Expand All @@ -50,7 +50,7 @@ export default defineComponent({
if (!props.attribute.user && feature.attributes[props.attribute.name]) {
valueMap[feature.attributes[props.attribute.name] as string] = true;
} else if (props.attribute.user && feature.attributes.userAttributes) {
const userAttr = (feature.attributes.userAttributes[user]) as StringKeyObject;
const userAttr = (feature.attributes.userAttributes[userLogin.value]) as StringKeyObject;
if (userAttr[props.attribute.name]) {
valueMap[userAttr[props.attribute.name] as string] = true;
}
Expand Down
Loading
Loading