diff --git a/backend/toolshed/admin.py b/backend/toolshed/admin.py index aeefc0c..a334c12 100644 --- a/backend/toolshed/admin.py +++ b/backend/toolshed/admin.py @@ -1,11 +1,11 @@ from django.contrib import admin -from toolshed.models import InventoryItem, Property, Tag, Category +from toolshed.models import InventoryItem, Property, Tag, Category, StorageLocation, WorkflowInstance class InventoryItemAdmin(admin.ModelAdmin): - list_display = ('name', 'description', 'category', 'availability_policy', 'owned_quantity', 'owner') - search_fields = ('name', 'description', 'category', 'availability_policy', 'owned_quantity', 'owner') + list_display = ('name', 'description', 'category', 'availability_policy', 'owned_quantity', 'owner', 'storage_location') + search_fields = ('name', 'description', 'category__name', 'availability_policy', 'owner__username', 'storage_location__name') admin.site.register(InventoryItem, InventoryItemAdmin) @@ -13,7 +13,7 @@ admin.site.register(InventoryItem, InventoryItemAdmin) class PropertyAdmin(admin.ModelAdmin): list_display = ('name', 'description', 'category', 'unit_symbol', 'base2_prefix', 'dimensions', 'origin') - search_fields = ('name', 'description', 'category', 'unit_symbol', 'base2_prefix', 'dimensions', 'origin') + search_fields = ('name', 'description', 'category__name', 'unit_symbol', 'origin') admin.site.register(Property, PropertyAdmin) @@ -21,7 +21,7 @@ admin.site.register(Property, PropertyAdmin) class TagAdmin(admin.ModelAdmin): list_display = ('name', 'description', 'category', 'origin') - search_fields = ('name', 'description', 'category', 'origin') + search_fields = ('name', 'description', 'category__name', 'origin') admin.site.register(Tag, TagAdmin) @@ -29,7 +29,16 @@ admin.site.register(Tag, TagAdmin) class CategoryAdmin(admin.ModelAdmin): list_display = ('name', 'description', 'parent', 'origin') - search_fields = ('name', 'description', 'parent', 'origin') + search_fields = ('name', 'description', 'parent__name', 'origin') admin.site.register(Category, CategoryAdmin) + + +class StorageLocationAdmin(admin.ModelAdmin): + list_display = ('name', 'description', 'category', 'parent', 'owner') + search_fields = ('name', 'description', 'category__name', 'parent__name', 'owner__username') + list_filter = ('category', 'owner') + + +admin.site.register(StorageLocation, StorageLocationAdmin) diff --git a/backend/toolshed/api/inventory.py b/backend/toolshed/api/inventory.py index c39a5c8..2ebd582 100644 --- a/backend/toolshed/api/inventory.py +++ b/backend/toolshed/api/inventory.py @@ -72,6 +72,19 @@ class StorageLocationViewSet(viewsets.ModelViewSet): return StorageLocation.objects.filter(owner=self.request.user.user.get()) return StorageLocation.objects.none() + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save(owner=self.request.user.user.get()) + + def perform_update(self, serializer): + with transaction.atomic(): + if serializer.instance.owner == self.request.user.user.get(): + serializer.save() + + def perform_destroy(self, instance): + if instance.owner == self.request.user.user.get(): + instance.delete() + router.register(r'inventory_items', InventoryItemViewSet, basename='inventory_items') router.register(r'storage_locations', StorageLocationViewSet, basename='storage_locations') diff --git a/backend/toolshed/models.py b/backend/toolshed/models.py index 2dd0713..e85b53c 100644 --- a/backend/toolshed/models.py +++ b/backend/toolshed/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.core.validators import MinValueValidator +from django.core.validators import MinValueValidator, MaxValueValidator from django_softdelete.models import SoftDeleteModel from rest_framework.exceptions import ValidationError diff --git a/backend/toolshed/serializers.py b/backend/toolshed/serializers.py index 73edeff..0f5b90a 100644 --- a/backend/toolshed/serializers.py +++ b/backend/toolshed/serializers.py @@ -50,12 +50,12 @@ class CategorySerializer(serializers.ModelSerializer): class StorageLocationSerializer(serializers.ModelSerializer): owner = OwnerSerializer(read_only=True) - category = CategorySerializer(required=False, allow_null=True) + category = serializers.CharField(required=False, allow_null=True, allow_blank=True) path = serializers.SerializerMethodField() class Meta: model = StorageLocation - fields = ['id', 'name', 'description', 'path', 'category', 'owner'] + fields = ['id', 'name', 'description', 'path', 'category', 'owner', 'parent'] read_only_fields = ['path'] @staticmethod diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue index b6dd9dc..c55f002 100644 --- a/frontend/src/components/Sidebar.vue +++ b/frontend/src/components/Sidebar.vue @@ -15,6 +15,18 @@ Inventory +
  • + + + Storage Locations + +
    • +
  • + + + Workflows + +
  • diff --git a/frontend/src/router.js b/frontend/src/router.js index 8386f82..006eae6 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -12,9 +12,14 @@ import Search from '@/views/Search.vue'; import InventoryDetail from '@/views/InventoryDetail.vue'; import InventoryNew from '@/views/InventoryNew.vue'; import InventoryEdit from '@/views/InventoryEdit.vue'; +import StorageLocation from '@/views/StorageLocation.vue'; +import StorageLocationDetail from '@/views/StorageLocationDetail.vue'; +import StorageLocationNew from '@/views/StorageLocationNew.vue'; +import StorageLocationEdit from '@/views/StorageLocationEdit.vue'; import Admin from '@/views/Admin.vue'; import Swatch from '@/views/Swatch.vue'; import Files from '@/views/Files.vue'; +import Workflows from '@/views/Workflows.vue'; import Account from '@/views/settings/Account.vue'; import Password from '@/views/settings/Password.vue'; @@ -43,6 +48,10 @@ const routes = [{path: '/', component: Dashboard, meta: {requiresAuth: true}}, { component: Friends, meta: {requiresAuth: true} }, {path: '/files', component: Files, meta: {requiresAuth: true}}, { + path: '/workflows', + component: Workflows, + meta: {requiresAuth: true} +}, { path: '/admin', component: Admin, meta: {requiresAuth: true} @@ -73,6 +82,24 @@ const routes = [{path: '/', component: Dashboard, meta: {requiresAuth: true}}, { }, { path: 'data/', name: 'data', component: Data, meta: {requiresAuth: true} }] +}, { + path: '/storage-location', + component: StorageLocation, + meta: {requiresAuth: true} +}, { + path: '/storage-locations/:id', + component: StorageLocationDetail, + meta: {requiresAuth: true}, + props: true +}, { + path: '/storage-locations/:id/edit', + component: StorageLocationEdit, + meta: {requiresAuth: true}, + props: true +}, { + path: '/storage-locations/new', + component: StorageLocationNew, + meta: {requiresAuth: true} }, {path: '/:pathMatch(.*)*', redirect: '/'}] const router = createRouter({ diff --git a/frontend/src/store.js b/frontend/src/store.js index 8456e4f..107a7c2 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -30,6 +30,7 @@ export default createStore({ availability_policies: [], domains: [], storage_locations: [], + active_workflows: [], }, mutations: { setInventoryItems(state, {url, items}) { @@ -65,6 +66,9 @@ export default createStore({ setFiles(state, files) { state.files = files; }, + setActiveWorkflows(state, workflows) { + state.active_workflows = workflows; + }, setUser(state, user) { state.user = user; if (state.remember) @@ -351,6 +355,28 @@ export default createStore({ state.last_load.storage_locations = Date.now() return data }, + async deleteStorageLocation({state, dispatch, getters}, location) { + const servers = await dispatch('getHomeServers') + const ret = await servers.delete(getters.signAuth, '/api/storage_locations/' + location.id + '/') + dispatch('fetchStorageLocations') + return ret + }, + async createStorageLocation({state, dispatch, getters}, location) { + const servers = await dispatch('getHomeServers') + const data = {...location} + if (data.parent === '') data.parent = null + const reply = await servers.post(getters.signAuth, '/api/storage_locations/', data) + state.last_load.storage_locations = 0 + return reply + }, + async updateStorageLocation({state, dispatch, getters}, location) { + const servers = await dispatch('getHomeServers') + const data = {...location} + if (data.parent === '') data.parent = null + const reply = await servers.patch(getters.signAuth, '/api/storage_locations/' + location.id + '/', data) + dispatch('fetchStorageLocations') + return reply + }, async fetchInfo({state, commit, dispatch, getters}) { const last_load_info = Math.min( state.last_load.tags, @@ -378,6 +404,72 @@ export default createStore({ }, async userIdentityRecord({state}, {password}) { return await serializeIdentityRecord(state.user, state.keypair, password); + }, + // Workflow actions + async fetchWorkflows({state, commit, dispatch, getters}) { + if (state.last_load.workflows > Date.now() - 1000 * 60 * 5) { // Cache for 5 minutes + return state.workflows + } + const servers = await dispatch('getHomeServers') + const data = await servers.get(getters.signAuth, '/api/workflows/') + commit('setWorkflows', data) + state.last_load.workflows = Date.now() + return data + }, + async fetchActiveWorkflows({state, commit, dispatch, getters}) { + if (state.last_load.active_workflows > Date.now() - 1000 * 60 * 5) { // Cache for 5 minutes + return state.active_workflows + } + const servers = await dispatch('getHomeServers') + const data = await servers.get(getters.signAuth, '/api/workflows/active/') + commit('setActiveWorkflows', data) + state.last_load.active_workflows = Date.now() + return data + }, + async createWorkflow({state, commit, dispatch, getters}, workflowData) { + const servers = await dispatch('getHomeServers') + const data = await servers.post(getters.signAuth, '/api/workflows/', workflowData) + state.last_load.active_workflows = 0 // Invalidate cache + return data + }, + async updateWorkflow({state, commit, dispatch, getters}, workflow) { + const servers = await dispatch('getHomeServers') + const data = await servers.patch(getters.signAuth, '/api/workflows/' + workflow.id + '/', workflow) + state.last_load.active_workflows = 0 // Invalidate cache + return data + }, + async updateWorkflowStep({state, commit, dispatch, getters}, {workflowId, currentStep, payload}) { + const servers = await dispatch('getHomeServers') + const data = await servers.post(getters.signAuth, '/api/workflows/' + workflowId + '/update_step/', { + current_step: currentStep, + payload: payload + }) + state.last_load.active_workflows = 0 // Invalidate cache + return data + }, + async pauseWorkflow({state, commit, dispatch, getters}, workflowId) { + const servers = await dispatch('getHomeServers') + const data = await servers.post(getters.signAuth, '/api/workflows/' + workflowId + '/pause/') + state.last_load.active_workflows = 0 // Invalidate cache + return data + }, + async resumeWorkflow({state, commit, dispatch, getters}, workflowId) { + const servers = await dispatch('getHomeServers') + const data = await servers.post(getters.signAuth, '/api/workflows/' + workflowId + '/resume/') + state.last_load.active_workflows = 0 // Invalidate cache + return data + }, + async cancelWorkflow({state, commit, dispatch, getters}, workflowId) { + const servers = await dispatch('getHomeServers') + const data = await servers.post(getters.signAuth, '/api/workflows/' + workflowId + '/cancel/') + state.last_load.active_workflows = 0 // Invalidate cache + return data + }, + async deleteWorkflow({state, commit, dispatch, getters}, workflowId) { + const servers = await dispatch('getHomeServers') + await servers.delete(getters.signAuth, '/api/workflows/' + workflowId + '/') + state.last_load.active_workflows = 0 // Invalidate cache + return true } }, getters: { diff --git a/frontend/src/views/InventoryEdit.vue b/frontend/src/views/InventoryEdit.vue index 06163b1..79edb96 100644 --- a/frontend/src/views/InventoryEdit.vue +++ b/frontend/src/views/InventoryEdit.vue @@ -39,6 +39,17 @@ +
    + + +
    +
    + + +
    + +
    +
    +

    Storage Locations

    +
    +
    +
    +
    +
    {{ user }}'s Storage Locations
    + + +
    + + + + + + + + + + + + + + + + + +
    NamePathCategoryActions
    + {{ location.name }} + + {{ location.path }} + + {{ location.category }} + - + + + + + + + +
    +
    +
    +
    +
    +
    +
    + + {{ location.name }} + +
    +
    + {{ location.path }} + {{ location.category }} +
    +
    + {{ location.description }} +
    +
    + + Edit + +
    +
    +
    +
    +
    +
    + +
    +
    + + Add +
    +
    +
    +
    +
    +     + + + + + diff --git a/frontend/src/views/StorageLocationDetail.vue b/frontend/src/views/StorageLocationDetail.vue new file mode 100644 index 0000000..adc3f0e --- /dev/null +++ b/frontend/src/views/StorageLocationDetail.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/frontend/src/views/StorageLocationEdit.vue b/frontend/src/views/StorageLocationEdit.vue new file mode 100644 index 0000000..b792950 --- /dev/null +++ b/frontend/src/views/StorageLocationEdit.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/frontend/src/views/StorageLocationNew.vue b/frontend/src/views/StorageLocationNew.vue new file mode 100644 index 0000000..0bbc130 --- /dev/null +++ b/frontend/src/views/StorageLocationNew.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/frontend/src/views/Workflows.vue b/frontend/src/views/Workflows.vue new file mode 100644 index 0000000..5f2c702 --- /dev/null +++ b/frontend/src/views/Workflows.vue @@ -0,0 +1,449 @@ + + + + +