TILA-1243 (#197)

* add resource validation to fe
* refactor by reorganising & chopping bigger components

Author: siren

.github/workflows/admin-ui.yml

@@ -18,7 +18,6 @@ on:
   pull_request:
     branches:
       - "main"
-      - "TILA-663"
     paths:
       - "admin-ui/**"
       - "yarn.lock"
@@ -30,8 +29,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js lts/fermium (14)
-        uses: actions/setup-node@v2-beta
+      - uses: actions/setup-node@v2
         with:
           node-version: "14"
       - name: Run CI checks

admin-ui/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@apollo/client": "3.5.6",
+    "@apollo/client": "3.5.9",
     "@axa-fr/react-oidc-context": "^3.1.6",
     "@n8tb1t/use-scroll-position": "^2.0.3",
     "@react-pdf/renderer": "^2.0.15",
@@ -20,7 +20,7 @@
     "@types/react-router-dom": "^5.1.7",
     "@types/styled-components": "^5.1.7",
     "apollo-link-token-refresh": "^0.3.2",
-    "apollo-upload-client": "^17.0.0",
+    "apollo-upload-client": "17.0.0",
     "axios": "^0.21.1",
     "axios-auth-refresh": "^3.1.0",
     "axios-case-converter": "^0.8.1",

admin-ui/src/App.tsx

@@ -27,7 +27,7 @@ import Unit from "./component/Unit/Unit";
 import UnitMap from "./component/Unit/UnitMap";
 import SpacesResources from "./component/Unit/SpacesResources";
 import SpaceEditorView from "./component/Spaces/space-editor/SpaceEditorView";
-import ResourceEditor from "./component/Resources/ResourceEditor";
+import ResourceEditorView from "./component/Resources/resource-editor/ResourceEditorView";
 import ReservationUnitEditor from "./component/ReservationUnits/ReservationUnitEditor";
 import ResourcesList from "./component/Resources/ResourcesList";
 import ReservationUnitsList from "./component/ReservationUnits/ReservationUnitsList";
@@ -144,7 +144,7 @@ function App(): JSX.Element {
             />
             <Route
               path="/unit/:unitPk/resource/edit/:resourcePk"
-              component={ResourceEditor}
+              component={ResourceEditorView}
             />
             <Route
               path="/unit/:unitPk/reservationUnit/edit/:reservationUnitPk?"

admin-ui/src/common/queries.ts

@@ -291,28 +291,6 @@ export const RESERVATION_UNIT_EDITOR_PARAMETERS = gql`
   }
 `;
 
-export const CREATE_RESOURCE = gql`
-  mutation createResource($input: ResourceCreateMutationInput!) {
-    createResource(input: $input) {
-      errors {
-        field
-        messages
-      }
-    }
-  }
-`;
-
-export const UPDATE_RESOURCE = gql`
-  mutation updateResource($input: ResourceUpdateMutationInput!) {
-    updateResource(input: $input) {
-      errors {
-        field
-        messages
-      }
-    }
-  }
-`;
-
 export const DELETE_RESOURCE = gql`
   mutation deleteResource($input: ResourceDeleteMutationInput!) {
     deleteResource(input: $input) {
@@ -322,23 +300,6 @@ export const DELETE_RESOURCE = gql`
   }
 `;
 
-export const RESOURCE_QUERY = gql`
-  query resource($pk: Int) {
-    resourceByPk(pk: $pk) {
-      pk
-      nameFi
-      nameSv
-      nameEn
-      descriptionFi
-      descriptionEn
-      descriptionSv
-      space {
-        pk
-      }
-    }
-  }
-`;
-
 export const RESERVATIONS_QUERY = gql`
   query reservations($state: String) {
     reservations(state: $state) {