revert: re-enable workspaces

.github/workflows/ui-test.yml

@@ -47,7 +47,7 @@ jobs:
 
  - uses: actions/setup-node@v3
  with:
- node-version: 16
+ node-version: 18
  check-latest: true
 
  - name: Add to Hosts

frontend/package.json

@@ -14,7 +14,7 @@
  "@vueuse/core": "^10.1.2",
  "dayjs": "^1.10.7",
  "feather-icons": "^4.28.0",
- "frappe-ui": "^0.1.57",
+ "frappe-ui": "^0.1.64",
  "fuzzysort": "^2.0.4",
  "gemoji": "^7.1.0",
  "htmldiff-js": "^1.0.5",
@@ -37,4 +37,4 @@
  "vite": "^4.4.9",
  "vue-template-compiler": "^2.7.14"
  }
-}
+}

frontend/src/components/Comment.vue

@@ -82,7 +82,7 @@
  label: 'Delete',
  variant: 'solid',
  theme: 'red',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return comments.setValue
  .submit({
  name: comment.name,

frontend/src/components/CommentsArea.vue

@@ -375,7 +375,7 @@ export default {
  actions: [
  {
  label: 'Discard comment',
- onClick: ({ close }) => {
+ onClick: (close) => {
  this.resetCommentState()
  close()
  },

frontend/src/components/CommentsList.vue

@@ -387,7 +387,7 @@ export default {
  actions: [
  {
  label: 'Discard comment',
- onClick: ({ close }) => {
+ onClick: (close) => {
  this.resetCommentState()
  close()
  },

frontend/src/components/DiscussionView.vue

@@ -378,7 +378,7 @@ export default {
  actions: [
  {
  label: 'Pin',
- onClick: ({ close }) =>
+ onClick: (close) =>
  this.$resources.discussion.pinDiscussion
  .submit()
  .then(close),
@@ -400,7 +400,7 @@ export default {
  actions: [
  {
  label: 'Unpin',
- onClick: ({ close }) =>
+ onClick: (close) =>
  this.$resources.discussion.unpinDiscussion
  .submit()
  .then(close),
@@ -423,7 +423,7 @@ export default {
  actions: [
  {
  label: 'Close',
- onClick: ({ close }) =>
+ onClick: (close) =>
  this.$resources.discussion.closeDiscussion
  .submit()
  .then(close),
@@ -446,7 +446,7 @@ export default {
  actions: [
  {
  label: 'Re-open',
- onClick: ({ close }) =>
+ onClick: (close) =>
  this.$resources.discussion.reopenDiscussion
  .submit()
  .then(close),

frontend/src/components/InviteGuestDialog.vue

@@ -111,7 +111,7 @@ function remove(user) {
  label: 'Delete',
  variant: 'solid',
  theme: 'red',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return pending.delete.submit(user.name).then(close)
  },
  },
@@ -126,7 +126,7 @@ function remove(user) {
  label: 'Delete',
  variant: 'solid',
  theme: 'red',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return props.project.removeGuest.submit(
  { email: user.user },
  {

frontend/src/components/NewTaskDialog.vue

@@ -44,8 +44,8 @@
  <Autocomplete
  placeholder="Assign a user"
  :options="assignableUsers"
- :value="newTask.assigned_to"
- @change="(option) => (newTask.assigned_to = option?.value || '')"
+ v-model="newTask.assigned_to"
+ @update:modelValue="(option) => (newTask.assigned_to = option?.value || '')"
  />
  </div>
  <ErrorMessage class="mt-2" :message="createTask.error" />
@@ -104,7 +104,6 @@ function statusOptions({ onClick }) {
 
 const assignableUsers = computed(() => {
  return activeUsers.value
- .filter((user) => user.name != newTask.value.assigned_to)
  .map((user) => ({
  label: user.full_name,
  value: user.name,

frontend/src/components/Poll.vue

@@ -192,7 +192,7 @@ export default {
  {
  label: `Vote for "${option.title}"`,
  variant: 'solid',
- onClick: ({ close }) => {
+ onClick: (close) => {
  this.$resources.poll.submitVote
  .submit({ option: option.title })
  .then(close)
@@ -220,7 +220,7 @@ export default {
  label: 'Stop',
  variant: 'solid',
  theme: 'red',
- onClick: ({ close }) =>
+ onClick: (close) =>
  this.$resources.poll.stopPoll.submit().then(close),
  },
  ],
@@ -281,7 +281,7 @@ export default {
  label: 'Retract vote',
  variant: 'solid',
  theme: 'red',
- onClick: ({ close }) =>
+ onClick: (close) =>
  this.$resources.poll.retractVote.submit().then(close),
  },
  ],
@@ -306,7 +306,7 @@ export default {
  label: 'Delete',
  variant: 'solid',
  theme: 'red',
- onClick: ({ close }) =>
+ onClick: (close) =>
  this.$resources.poll.delete.submit().then(close),
  },
  ],

frontend/src/components/ReadmeEditor.vue

@@ -57,7 +57,7 @@
  v-if="collapsible && readmeHeight > 150"
  >
  <Tooltip text="Expand/Collapse">
- <Button variant="ghost" @click="expand = !expand">
+ <Button variant="ghost" @click.stop="expandCollapse">
  <template #icon>
  <LucideUnfoldVertical class="w-4" />
  </template>
@@ -123,6 +123,10 @@ export default {
  this.$refs.readme.editor.commands.focus()
  })
  },
+ expandCollapse(e) {
+ e.stopImmediatePropagation()
+ this.expand = !this.expand
+ },
  },
 }
 </script>

frontend/src/components/Settings/Members.vue

@@ -109,7 +109,7 @@ export default {
  {
  label: 'Change Role',
  variant: 'solid',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return this.$resources.changeUserRole.submit(
  { user: user.name, role },
  { onSuccess: close }
@@ -132,7 +132,7 @@ export default {
  label: 'Remove User',
  variant: 'solid',
  theme: 'red',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return this.$resources.removeUser.submit(
  { user: user.name },
  { onSuccess: close }

frontend/src/components/TaskDetail.vue

@@ -38,7 +38,7 @@
  label: 'Delete',
  theme: 'red',
  variant: 'solid',
- onClick({ close }) {
+ onClick(close) {
  return $resources.task.delete.submit(null, {
  onSuccess() {
  close()
@@ -79,14 +79,8 @@
  <Autocomplete
  placeholder="Assign a user"
  :options="assignableUsers"
- :value="$resources.task.doc.assigned_to"
- @change="
- (option) => {
- $resources.task.setValue.submit({
- assigned_to: option?.value || '',
- })
- }
- "
+ v-model="$resources.task.doc.assigned_to"
+ @update:modelValue="changeAssignee"
  />
  <TextInput
  type="date"
@@ -133,14 +127,8 @@
  <Autocomplete
  placeholder="Assign a user"
  :options="assignableUsers"
- :value="$resources.task.doc.assigned_to"
- @change="
- (option) => {
- $resources.task.setValue.submit({
- assigned_to: option?.value || '',
- })
- }
- "
+ v-model="$resources.task.doc.assigned_to"
+ @update:modelValue="changeAssignee"
  />
  </div>
  <div>Due Date</div>
@@ -218,6 +206,10 @@ export default {
  whitelistedMethods: {
  trackVisit: 'track_visit',
  },
+ transform: (doc) => {
+ doc.project = doc.project.toString();
+ return doc
+ },
  setValue: {
  onError(e) {
  let message = e.messages ? e.messages.join('\n') : e.message
@@ -241,6 +233,9 @@ export default {
  },
  },
  methods: {
+ changeAssignee(option) {
+ this.$resources.task.setValue.submit({ assigned_to: option?.value || '' });
+ },
  changeProject(option) {
  this.$resources.task.setValue.submit(
  {
@@ -270,7 +265,6 @@ export default {
  computed: {
  assignableUsers() {
  return activeUsers.value
- .filter((user) => user.name != this.$resources.task.doc.assigned_to)
  .map((user) => ({
  label: user.full_name,
  value: user.name,

frontend/src/pages/PageGrid.vue

@@ -22,9 +22,8 @@
  actions: [
  {
  label: 'Delete',
- onClick: ({ close }) => {
- close()
- return $resources.pages.delete.submit(d.name)
+ onClick: (close) => {
+ return $resources.pages.delete.submit(d.name).then(close)
  },
  variant: 'solid',
  theme: 'red',

frontend/src/pages/Project.vue

@@ -111,7 +111,7 @@
  {
  label: 'Save',
  variant: 'solid',
- onClick({ close }) {
+ onClick(close) {
  return project.setValue
  .submit({
  title: project.doc.title,
@@ -429,7 +429,7 @@ export default {
  {
  label: 'Archive',
  variant: 'solid',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return this.project.archive.submit(null, {
  onSuccess: close,
  })
@@ -446,7 +446,7 @@ export default {
  {
  label: 'Unarchive',
  variant: 'solid',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return this.project.unarchive.submit(null, {
  onSuccess: close,
  })

frontend/src/pages/ProjectDiscussionNew.vue

@@ -183,7 +183,7 @@ export default {
  actions: [
  {
  label: 'Discard post',
- onClick: ({ close }) => {
+ onClick: (close) => {
  localStorage.removeItem(this.draftPostKey())
  this.$router.push({ name: 'ProjectDiscussions' })
  close()

frontend/src/pages/Team.vue

@@ -106,7 +106,7 @@ export default {
  {
  label: 'Archive',
  variant: 'solid',
- onClick: ({ close }) => {
+ onClick: (close) => {
  return this.team.archive.submit(null, {
  onSuccess: () => {
  this.$router.replace({ name: 'Home' })

package.json

@@ -1,9 +1,12 @@
 {
  "private": true,
- "aworkspaces": ["frontend", "frappe-ui"],
+ "workspaces": [
+ "frontend",
+ "frappe-ui"
+ ],
  "scripts": {
  "postinstall": "cd frontend && yarn install",
  "dev": "cd frontend && yarn dev",
  "build": "cd frontend && yarn build"
  }
-}
+}