Feat/merge UI library

.storybook/decorators/withToaster.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { Decorator, StoryContext } from '@storybook/react';
-import { Toaster } from '@uselagoon/ui-library';
+import { Toaster } from '@/ui-library/index';
 
 export const withToaster: Decorator = (Story, context: StoryContext) => {
   const theme = context.globals?.theme || 'dark';

.storybook/main.ts

@@ -25,13 +25,5 @@ const config: StorybookConfig = {
     reactDocgen: 'react-docgen-typescript',
   },
 
-  refs: {
-    'ui-library': {
-      title: 'ui-library',
-      url: 'https://main--69698d15d02f1ad6e82d516e.chromatic.com',
-      expanded: false,
-    },
-  },
-
 };
 export default config;

package.json

@@ -6,12 +6,11 @@
   "main": "src/index.js",
   "license": "MIT",
   "scripts": {
-    "dev": "yarn uilib:update && next dev --turbopack -p 3003",
-    "build": "yarn uilib:update && next build",
+    "dev": "next dev --turbopack -p 3003",
+    "build": "next build",
     "start": "next start -p 3000",
     "start:cypress": "next start -H 0.0.0.0 -p 3000",
     "lint": "tsc && eslint --config .eslintrc.cjs 'src/**/*.{jsx,tsx}'",
-    "uilib:update": "yarn upgrade @uselagoon/ui-library",
     "generateTourHash": "node tourHash.js",
     "storybook": "storybook dev -p 6006",
     "test-storybook": "test-storybook",
@@ -29,24 +28,69 @@
     "@apollo/client": "^3.13.8",
     "@apollo/experimental-nextjs-app-support": "^0.11.11",
     "@bprogress/next": "^3.2.12",
+    "@hookform/resolvers": "^5.1.1",
+    "@radix-ui/react-accordion": "^1.2.11",
+    "@radix-ui/react-alert-dialog": "^1.1.14",
+    "@radix-ui/react-aspect-ratio": "^1.1.7",
+    "@radix-ui/react-avatar": "^1.1.10",
+    "@radix-ui/react-checkbox": "^1.3.2",
+    "@radix-ui/react-collapsible": "^1.1.11",
+    "@radix-ui/react-context-menu": "^2.2.15",
+    "@radix-ui/react-dialog": "^1.1.14",
+    "@radix-ui/react-dropdown-menu": "^2.1.15",
+    "@radix-ui/react-hover-card": "^1.1.14",
+    "@radix-ui/react-label": "^2.1.7",
+    "@radix-ui/react-menubar": "^1.1.15",
+    "@radix-ui/react-navigation-menu": "^1.2.13",
+    "@radix-ui/react-popover": "^1.1.14",
+    "@radix-ui/react-progress": "^1.1.7",
+    "@radix-ui/react-radio-group": "^1.3.7",
+    "@radix-ui/react-scroll-area": "^1.2.9",
+    "@radix-ui/react-select": "^2.2.5",
+    "@radix-ui/react-separator": "^1.1.7",
+    "@radix-ui/react-slider": "^1.3.5",
+    "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-switch": "^1.2.5",
+    "@radix-ui/react-tabs": "^1.1.12",
+    "@radix-ui/react-toggle": "^1.1.9",
+    "@radix-ui/react-toggle-group": "^1.1.10",
+    "@radix-ui/react-tooltip": "^1.2.7",
     "@tailwindcss/postcss": "^4.1.8",
+    "@tanstack/react-table": "^8.21.3",
     "@types/git-url-parse": "^9.0.3",
-    "@uselagoon/ui-library": "github:uselagoon/ui-library#v0.1.8",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
+    "cmdk": "^1.1.1",
     "cryptr": "^6.3.0",
     "cypress-real-events": "^1.14.0",
+    "date-fns": "^3.6.0",
     "dayjs": "^1.11.13",
+    "embla-carousel-react": "^8.6.0",
     "express": "^4.21.0",
     "git-url-parse": "^15.0.0",
     "graphql-ws": "^5.16.0",
+    "input-otp": "^1.4.2",
     "lucide-react": "^0.526.0",
     "next": "^15.4.4",
     "next-auth": "^5.0.0-beta.28",
     "next-runtime-env": "^3.3.0",
+    "next-themes": "^0.4.6",
     "nuqs": "^1.20.0",
     "postcss": "^8.5.4",
     "react": "^19.1.0",
+    "react-day-picker": "^9.7.0",
     "react-dom": "^19.1.0",
-    "tailwindcss": "^4.1.8"
+    "react-highlight-words": "^0.21.0",
+    "react-hook-form": "^7.58.1",
+    "react-loading-skeleton": "^3.5.0",
+    "react-resizable-panels": "^3.0.3",
+    "recharts": "^2.15.4",
+    "sonner": "^2.0.5",
+    "tailwind-merge": "^3.3.0",
+    "tailwindcss": "^4.1.8",
+    "tw-animate-css": "^1.3.4",
+    "vaul": "^1.1.2",
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@chromatic-com/storybook": "^2.0.2",
@@ -61,9 +105,11 @@
     "@storybook/test": "8.6.14",
     "@storybook/test-runner": "0.21.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/lodash": "^4.17.17",
     "@types/node": "^20",
     "@types/react": "19.1.6",
     "@types/react-dom": "19.1.5",
+    "@types/react-highlight-words": "^0.20.0",
     "cypress": "14.0.3",
     "cypress-network-idle": "^1.15.0",
     "eslint": "^8",

src/app/(routegroups)/(orgroutes)/organizations/(organizations-page)/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { OrganizationsTableColumns } from '@/components/pages/organizations/DataTableColumns';
-import { Button, DataTable, SelectWithOptions } from '@uselagoon/ui-library';
+import { Button, DataTable, SelectWithOptions } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/(organization-overview)/loading.tsx

@@ -5,7 +5,7 @@ import { AddUser } from '@/components/addUserToOrg/Adduser';
 import { CreateGroup } from '@/components/createGroup/CreateGroup';
 import { CreateProject } from '@/components/createProject/CreateProject';
 import { Description } from '@/components/pages/organizations/organization/_components/Description';
-import { DetailStat, Skeleton } from '@uselagoon/ui-library';
+import { DetailStat, Skeleton } from '@/ui-library';
 
 export default function Loading() {
   const orgSkeletonItems = [

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/groups/(groups-page)/loading.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import GroupsDataTableColumns from '@/components/pages/organizations/groups/GroupsDataTableColumns';
-import { DataTable, Skeleton } from '@uselagoon/ui-library';
+import { DataTable, Skeleton } from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/groups/[groupSlug]/loading.tsx

@@ -4,7 +4,7 @@ import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { GroupPageProjectColumns } from '@/components/pages/organizations/group/_components/GroupPageProjectsColumns';
 import GroupPageUsersColumns from '@/components/pages/organizations/group/_components/GroupPageUsersColumns';
 import { resultsFilterValues } from '@/components/pages/organizations/groups/_components/groupFilterValues';
-import { Checkbox, DataTable, SelectWithOptions, Skeleton } from '@uselagoon/ui-library';
+import { Checkbox, DataTable, SelectWithOptions, Skeleton } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/manage/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { AddUser } from '@/components/pages/organizations/manage/_components/AddUser';
 import { manageTableLoadingCols } from '@/components/pages/organizations/manage/_components/ManageDataTableColumns';
-import { DataTable } from '@uselagoon/ui-library';
+import { DataTable } from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/notifications/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { AddNotification } from '@/components/pages/organizations/notifications/_components/AddNotification';
 import { NotificationsDataTableColumnsLoading } from '@/components/pages/organizations/notifications/_components/NotificationsDataTableColumns';
-import { DataTable } from '@uselagoon/ui-library';
+import { DataTable } from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/projects/(projects-page)/loading.tsx

@@ -4,7 +4,7 @@ import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { CreateProject } from '@/components/createProject/CreateProject';
 import { resultsFilterValues } from '@/components/pages/organizations/groups/_components/groupFilterValues';
 import { ProjectsDataTableColumns } from '@/components/pages/organizations/projects/_components/ProjectsDataTableColumns';
-import { DataTable, SelectWithOptions } from '@uselagoon/ui-library';
+import { DataTable, SelectWithOptions } from '@/ui-library';
 
 import { OrgProject } from '../../(organization-overview)/page';
 

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/projects/[projectSlug]/loading.tsx

@@ -6,7 +6,7 @@ import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { notificationTypeOptions } from '@/components/pages/organizations/notifications/_components/filterOptions';
 import { OrgProjectGroupColumns } from '@/components/pages/organizations/project/OrgProjectGroupColumns';
 import { OrgProjectNotificationColumns } from '@/components/pages/organizations/project/OrgProjectNotificationColumns';
-import { Checkbox, DataTable, SelectWithOptions, Skeleton } from '@uselagoon/ui-library';
+import { Checkbox, DataTable, SelectWithOptions, Skeleton } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/users/(users-page)/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import UsersDataTableColumns from '@/components/pages/organizations/users/UsersDataTableColumns';
 import { organizationNavItems } from '@/components/shared/organizationNavItems';
-import { DataTable, Skeleton } from '@uselagoon/ui-library';
+import { DataTable, Skeleton } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/users/[userSlug]/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { UserDataTableColumns } from '@/components/pages/organizations/user/_components/UserGroupsTableColumns';
 import { resultsFilterValues } from '@/components/pages/organizations/user/_components/filterValues';
-import { Checkbox, DataTable, SelectWithOptions } from '@uselagoon/ui-library';
+import { Checkbox, DataTable, SelectWithOptions } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(orgroutes)/organizations/[organizationSlug]/variables/loading.tsx

@@ -4,7 +4,7 @@ import { OrgEnvVariable } from '@/app/(routegroups)/(orgroutes)/organizations/[o
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { resultsFilterValues } from '@/components/pages/organizations/groups/_components/groupFilterValues';
 import { VariablesDataTableColumnsNoValues } from '@/components/pages/organizations/variables/_components/VariablesDataTableColumns';
-import {DataTable, SelectWithOptions, Switch} from '@uselagoon/ui-library';
+import {DataTable, SelectWithOptions, Switch} from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(projectroutes)/projects/(projects-page)/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import ProjectsTableColumns from '@/components/pages/projects/DataTableColumns';
-import { Button, DataTable, SelectWithOptions } from '@uselagoon/ui-library';
+import { Button, DataTable, SelectWithOptions } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/(project-overview)/loading.tsx

@@ -5,7 +5,7 @@ import { usePathname } from 'next/navigation';
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import getProjectEnvsTableColumns from '@/components/pages/environments/ProjectEnvsTableColumns';
 import { RouterType } from '@/components/types';
-import { DataTable, SelectWithOptions } from '@uselagoon/ui-library';
+import { DataTable, SelectWithOptions } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/(environment-overview)/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import KeyFacts from '@/components/pages/environment/_components/KeyFacts';
-import { DetailStat, Skeleton } from '@uselagoon/ui-library';
+import { DetailStat, Skeleton } from '@/ui-library';
 
 export default function Loading() {
   const environmentDetailSkeletonItems = [

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/backups/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import BackupsTableColumns from '@/components/pages/backups/_components/TableColumns';
 import { backupResultOptions, statusOptions } from '@/components/pages/backups/_components/filterValues';
-import { DataTable, DateRangePicker, SelectWithOptions } from '@uselagoon/ui-library';
+import { DataTable, DateRangePicker, SelectWithOptions } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/deployments/(deployments-page)/loading.tsx

@@ -6,7 +6,7 @@ import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import DeployLatest from '@/components/pages/deployments/_components/DeployLatest';
 import getDeploymentTableColumns from '@/components/pages/deployments/_components/TableColumns';
 import { deploymentResultOptions, statusOptions } from '@/components/pages/deployments/_components/filterValues';
-import { DataTable, DateRangePicker, SelectWithOptions } from '@uselagoon/ui-library';
+import { DataTable, DateRangePicker, SelectWithOptions } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/deployments/[deploymentSlug]/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import BackButton from '@/components/backButton/BackButton';
 import { deploymentColumns } from '@/components/pages/deployment/DeploymentPage';
-import { BasicTable, Skeleton } from '@uselagoon/ui-library';
+import { BasicTable, Skeleton } from '@/ui-library';
 
 export default function Loading() {
   const skeletonCount = 10;

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/environment-variables/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { scopeOptions } from '@/components/pages/environmentVariables/_components/filterValues';
 import { ProjectEnvVarsPartialColumns } from '@/components/pages/projectVariables/_components/DataTableColumns';
-import {Button, DataTable, SelectWithOptions, Switch} from '@uselagoon/ui-library';
+import {Button, DataTable, SelectWithOptions, Switch} from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/insights/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { FactsTableColumns, InsightsTableColumns } from '@/components/pages/insights/DataTableColumns';
-import { DataTable } from '@uselagoon/ui-library';
+import { DataTable } from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/problems/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import ProblemsColumns from '@/components/pages/problems/ProblemsTableColumns';
-import { DataTable } from '@uselagoon/ui-library';
+import { DataTable } from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/routes/loading.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
-import { DataTable } from '@uselagoon/ui-library';
+import { DataTable } from '@/ui-library';
 import {CreateRoute} from "@/components/createRoute/CreateRoute";
 import {RoutesDataTableColumns} from "@/components/pages/environmentRoutes/_components/RoutesDataTableColumns";
 

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/tasks/(tasks-page)/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import getTasksTableColumns from '@/components/pages/tasks/_components/TableColumns';
-import { DataTable, SelectWithOptions } from '@uselagoon/ui-library';
+import { DataTable, SelectWithOptions } from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/[environmentSlug]/tasks/[taskSlug]/loading.tsx

@@ -3,7 +3,7 @@
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import BackButton from '@/components/backButton/BackButton';
 import { taskColumns } from '@/components/pages/task/TaskPage';
-import { BasicTable, Skeleton } from '@uselagoon/ui-library';
+import { BasicTable, Skeleton } from '@/ui-library';
 
 export default function Loading() {
   const skeletonCount = 10;

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/deploy-targets/loading.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
-import { BasicTable, Skeleton } from '@uselagoon/ui-library';
+import { BasicTable, Skeleton } from '@/ui-library';
 
 export default function Loading() {
   const deployTargetColumns = [

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/project-details/loading.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
-import { DetailStat, Skeleton } from '@uselagoon/ui-library';
+import { DetailStat, Skeleton } from '@/ui-library';
 
-// import { DetailedStats, LoadingSkeleton } from '@uselagoon/ui-library';
+// import { DetailedStats, LoadingSkeleton } from '@/ui-library';
 
 export default function Loading() {
   const detailItems = [

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/project-variables/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import { ProjectEnvVarsPartialColumns } from '@/components/pages/projectVariables/_components/DataTableColumns';
-import {DataTable, Switch} from '@uselagoon/ui-library';
+import {DataTable, Switch} from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/(projectroutes)/projects/[projectSlug]/routes/loading.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
-import { DataTable } from '@uselagoon/ui-library';
+import { DataTable } from '@/ui-library';
 import {CreateRoute} from "@/components/createRoute/CreateRoute";
 import {RoutesDataTableColumns} from "@/components/pages/routes/_components/RoutesDataTableColumns";
 

src/app/(routegroups)/alldeployments/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import AlldeploymentsTableColumns from '@/components/pages/allDeployments/TableColumns';
-import { DataTable, SelectWithOptions } from '@uselagoon/ui-library';
+import { DataTable, SelectWithOptions } from '@/ui-library';
 import { useQueryStates } from 'nuqs';
 
 export default function Loading() {

src/app/(routegroups)/bulkdeployment/[bulkId]/loading.tsx

@@ -2,7 +2,7 @@
 
 import SectionWrapper from '@/components/SectionWrapper/SectionWrapper';
 import BulkDeploymentColumns from '@/components/pages/bulkDeployments/TableColumns';
-import { DataTable, SelectWithOptions, Skeleton } from '@uselagoon/ui-library';
+import { DataTable, SelectWithOptions, Skeleton } from '@/ui-library';
 
 export default function Loading() {
   return (

src/app/(routegroups)/changefeed/loading.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeFeedContainer } from "@uselagoon/ui-library";
+import { ChangeFeedContainer } from "@/ui-library";
 
 export default function LoadingPage() {
     return (