Täsä the data

src/auth/IAMConfig.ts

@@ -1,5 +1,6 @@
 import { normalizeOrganisationCode } from './common'
-import { FACULTY_MAP, data } from './data'
+import { FACULTIES } from '../organisation/faculties'
+import { FACULTY_MAP } from '../organisation/types'
 
 const ANY = 'ANY'
 
@@ -498,7 +499,7 @@ const iamToFaculty = (iam) => {
 
   for (const f of faculties) {
     if (facultyIamsMap[f].includes(iam)) {
-      const faculty = data.find(({ code }) => code === FACULTY_MAP[f])
+      const faculty = FACULTIES.find(({ code }) => code === FACULTY_MAP[f])
       return faculty
     }
   }
@@ -527,9 +528,9 @@ const RELEVANT_ORGANISATION_CODES = [
 ]
 
 const relevantOrganisations = RELEVANT_ORGANISATION_CODES.concat(
-  data.map((faculty) => faculty.code),
+  FACULTIES.map((faculty) => faculty.code),
 ).concat(
-  data.flatMap((faculty) =>
+  FACULTIES.flatMap((faculty) =>
     faculty.programmes.map((programme) =>
       normalizeOrganisationCode(programme.key),
     ),

src/auth/IAMRights.js

@@ -16,7 +16,7 @@ import {
   isKatselmusViewer,
   dekaaniIamToFaculty
 } from './IAMConfig'
-import { data } from './data'
+import { FACULTIES } from '../organisation/faculties'
 import { mapToDegreeCode } from './common'
 
 /**
@@ -28,7 +28,7 @@ import { mapToDegreeCode } from './common'
  */
 const getAllProgrammeAccess = (accessLevel, where) => {
   const access = {}
-  data.forEach((faculty) => {
+  FACULTIES.forEach((faculty) => {
     faculty.programmes.forEach((program) => {
       if (where?.(program) === false) return
       access[program.key] = { ...accessLevel }
@@ -195,7 +195,7 @@ const getFacultyReadingRights = (hyGroups) => {
     .filter(Boolean)
   const access = {}
   facultyCodes.forEach((fc) => {
-    const faculty = data.find((faculty) => faculty.code === fc)
+    const faculty = FACULTIES.find((faculty) => faculty.code === fc)
     const programmeCodes = faculty.programmes.map((p) => p.key)
     programmeCodes.forEach((code) => {
       access[code] = { read: true, write: false, admin: false }
@@ -214,7 +214,7 @@ const getFacultyAdminRights = (hyGroups) => {
 
   const access = {}
   facultyCodes.forEach((fc) => {
-    const faculty = data.find((faculty) => faculty.code === fc)
+    const faculty = FACULTIES.find((faculty) => faculty.code === fc)
     const programmeCodes = faculty.programmes.map((p) => p.key)
     programmeCodes.forEach((code) => {
       access[code] = { read: true, write: true, admin: true }