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

Updated save messaging and added the storyline title + scrollbar to UUID dropdown #316

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Updated save messaging and added the storyline title + scrollbar to UUID dropdown #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 67 additions & 19 deletions src/components/metadata-editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,29 @@
v-model="uuid"
@focus="showDropdown = true"
@blur="showDropdown = false"
@keydown.down.prevent="highlightNext"
@keydown.up.prevent="highlightPrevious"
@keydown.enter.prevent="selectHighlighted"
:class="{ 'input-error': error || !reqFields.uuid }"
/>
<div
class="absolute z-10 w-full bg-white border border-gray-200 mt-1"
class="absolute z-10 w-full bg-white border border-gray-200 mt-1 max-h-60vh overflow-y-auto"
v-show="showDropdown"
>
<ul>
<li
v-for="storyline in getStorylines"
v-for="(storyline, index) in getStorylines"
:key="storyline.uuid"
@mousedown.prevent="selectUuid(storyline.uuid)"
:class="[
'p-2 hover:bg-gray-100 cursor-pointer',
storyline.isUserStoryline ? 'bg-gray-200' : ''
storyline.isUserStoryline ? 'bg-gray-200' : '',
{ 'bg-gray-300': highlightedIndex === index }
]"
>
{{ storyline.uuid }}
<div>
{{ storyline.uuid }} - <b>{{ storyline.title }}</b>
</div>
</li>
</ul>
</div>
Expand Down Expand Up @@ -379,6 +385,7 @@ export default class MetadataEditorV extends Vue {
warning: 'none' | 'uuid' | 'rename' = 'none'; // used for duplicate uuid warning
configLang = 'en';
showDropdown = false;
highlightedIndex = -1;

storylineHistory: History[] = [];
selectedHistory: History | null = null;
Expand Down Expand Up @@ -944,6 +951,7 @@ export default class MetadataEditorV extends Vue {
const formData = new FormData();
formData.append('data', content, `${this.uuid}.zip`);
const headers = { 'Content-Type': 'multipart/form-data' };
Message.warning('Please wait. This may take several minutes.');

axios
.post(this.apiUrl + '/upload', formData, { headers })
Expand All @@ -953,13 +961,13 @@ export default class MetadataEditorV extends Vue {
responseData.status; // HTTP status
this.unsavedChanges = false;
this.loadExisting = true; // if editExisting was false, we can now set it to true
Message.success('Successfully saved changes!');

if (process.env.VUE_APP_CURR_ENV !== '#{CURR_ENV}#') {
if (responseData.new) {
axios
.post(process.env.VUE_APP_NET_API_URL + '/api/user/register', {
uuid: this.uuid
uuid: this.uuid,
title: this.metadata.title ?? ''
})
.then((response: any) => {
const userStore = useUserStore();
Expand All @@ -970,19 +978,31 @@ export default class MetadataEditorV extends Vue {
axios
.post(process.env.VUE_APP_NET_API_URL + '/api/version/commit', formData)
.then((response: any) => {
console.log('Version saved successfully.');
Message.success('Successfully saved changes!');
})
.catch((error: any) => console.log(error.response || error));
.catch((error: any) => console.log(error.response || error))
.finally(() => {
// padding to prevent save button from being clicked rapidly
setTimeout(() => {
this.saving = false;
}, 500);
});
})
.catch((error: any) => console.log(error.response || error));
} else {
formData.append('uuid', this.uuid);
axios
.post(process.env.VUE_APP_NET_API_URL + '/api/version/commit', formData)
.then((response: any) => {
console.log('Version saved successfully.');
Message.success('Successfully saved changes!');
})
.catch((error: any) => console.log(error.response || error));
.catch((error: any) => console.log(error.response || error))
.finally(() => {
// padding to prevent save button from being clicked rapidly
setTimeout(() => {
this.saving = false;
}, 500);
});
}

fetch(this.apiUrl + `/retrieveMessages`)
Expand All @@ -1001,12 +1021,6 @@ export default class MetadataEditorV extends Vue {
})
.catch(() => {
Message.error('Failed to save changes.');
})
.finally(() => {
// padding to prevent save button from being clicked rapidly
setTimeout(() => {
this.saving = false;
}, 500);
});
});

Expand Down Expand Up @@ -1140,6 +1154,7 @@ export default class MetadataEditorV extends Vue {
});
}
this.warning = 'none';
this.highlightedIndex = -1;
});

/**
Expand Down Expand Up @@ -1268,16 +1283,49 @@ export default class MetadataEditorV extends Vue {
}
}

highlightNext() {
if (this.highlightedIndex < this.getStorylines.length - 1) {
this.highlightedIndex++;
this.scrollIntoView();
}
}

highlightPrevious() {
if (this.highlightedIndex > 0) {
this.highlightedIndex--;
this.scrollIntoView();
}
}

selectHighlighted() {
if (this.highlightedIndex !== -1) {
const selectedStoryline = this.getStorylines[this.highlightedIndex];
this.selectUuid(selectedStoryline.uuid);
}
}

scrollIntoView() {
this.$nextTick(() => {
const container = this.$el.querySelector('.overflow-y-auto');
const activeItem = container.querySelector('li.bg-gray-300');
if (activeItem) container.scrollTop = activeItem.offsetTop - container.offsetTop;
});
}

get getStorylines() {
const userStore = useUserStore();
const userStorylines = userStore.userProfile.storylines?.map((s) => ({ ...s, isUserStoryline: true })) || [];
const allStorylines =
userStore.userProfile.allStorylines?.filter((s) => !userStorylines.some((u) => u.uuid === s.uuid)) || [];

let combined = [...userStorylines, ...allStorylines];

if (this.uuid)
combined = combined.filter((storyline) => storyline.uuid.toLowerCase().includes(this.uuid.toLowerCase()));
if (this.uuid) {
combined = combined.filter(
(storyline) =>
storyline.uuid.toLowerCase().includes(this.uuid.toLowerCase()) ||
(storyline.title && storyline.title.toLowerCase().includes(this.uuid.toLowerCase()))
);
}

return combined;
}
Expand Down
1 change: 1 addition & 0 deletions src/stores/userStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { defineStore } from 'pinia';

interface Storyline {
uuid: string;
title: string;
isUserStoryline?: boolean;
}

Expand Down
3 changes: 3 additions & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ module.exports = {
flex: {
2: '2 2 0%'
},
maxHeight:{
'60vh': '60vh'
},
maxWidth: {
'8xl': '90rem',
'9xl': '110rem'
Expand Down
Loading