Merge pull request #14 from equinor/fix/remove-acl-dependency

fix/remove-acl-dependency

.eslintrc.cjs

@@ -69,7 +69,7 @@ module.exports = {
     },
     {
       files: ['**/*.js', '**/*.ts', '**/*.tsx'],
-      excludedFiles: ['*.test.*', '*.stories.*', './src/providers/AuthProvider/**', './src/utils/auth_environment.ts'],
+      excludedFiles: ['*.test.*', '*.stories.*', './src/utils/environment.ts'],
       rules: {
         'no-console': ['warn', { allow: ['warn', 'error'] }],
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/subsurface-app-management",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "React Typescript components/hooks to communicate with equinor/sam",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -51,7 +51,6 @@
     "jwt-decode": "^4.0.0"
   },
   "devDependencies": {
-    "@equinor/amplify-components": "^7.10.5",
     "@equinor/eds-icons": "^0.21.0",
     "@faker-js/faker": "^8.4.1",
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -114,7 +113,6 @@
     "vitest": "^1.2.2"
   },
   "peerDependencies": {
-    "@equinor/amplify-components": "*",
     "@equinor/eds-core-react": "*",
     "@equinor/eds-icons": "*",
     "@tanstack/react-query": "*",

src/api/core/OpenAPI.ts

@@ -2,14 +2,13 @@
 /* tslint:disable */
 /* eslint-disable */
 import type { ApiRequestOptions } from './ApiRequestOptions';
-import { auth, environment } from 'src/utils';
+import { environment } from 'src/utils';
 import { CancelablePromise } from 'src/api';
 import { request as __request } from 'src/api/core/request';
 import { getLocalStorage, updateLocalStorage } from 'src/utils/localStorage';
 import { JwtPayload, jwtDecode } from 'jwt-decode';
 
-const { getToken: getApplicationToken } = auth;
-const { getApiUrl, getEnvironmentName } = environment;
+const { getEnvironmentName, getApiUrl } = environment;
 
 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 type Headers = Record<string, string>;
@@ -38,7 +37,7 @@ export class TokenService {
    * @throws ApiError
    */
   public static getAmplifyPortalToken(): CancelablePromise<string> {
-    return __request(OpenAPI, {
+    return __request(OpenAPI_SAM, {
       method: 'GET',
       url: '/api/v1/Token/AmplifyPortal',
     });
@@ -49,7 +48,7 @@ export class TokenService {
    * @throws ApiError
    */
   public static getAmplifyPortalProductionToken(): CancelablePromise<string> {
-    return __request(OpenAPI, {
+    return __request(OpenAPI_SAM, {
       method: 'GET',
       url: '/api/v1/Token/AmplifyPortal/Production',
     });
@@ -98,12 +97,12 @@ const getPortalProdToken = async () => {
   );
 };
 
-export const OpenAPI: OpenAPIConfig = {
+export const OpenAPI_SAM: OpenAPIConfig = {
   BASE: getApiUrl(import.meta.env.VITE_API_URL),
   VERSION: '1.0',
   WITH_CREDENTIALS: false,
   CREDENTIALS: 'include',
-  TOKEN: getApplicationToken,
+  TOKEN: undefined,
   USERNAME: undefined,
   PASSWORD: undefined,
   HEADERS: undefined,
@@ -121,6 +120,7 @@ export const OpenAPI_Portal: OpenAPIConfig = {
   HEADERS: undefined,
   ENCODE_PATH: undefined,
 };
+
 export const OpenAPI_Portal_Prod: OpenAPIConfig = {
   BASE: `https://api-amplify-portal-production.radix.equinor.com`,
   VERSION: '1.0',

src/api/index.ts

@@ -3,9 +3,9 @@
 /* eslint-disable */
 export { ApiError } from './core/ApiError';
 export { CancelablePromise, CancelError } from './core/CancelablePromise';
-export { OpenAPI, getPortalToken } from './core/OpenAPI';
+export { OpenAPI_SAM, getPortalToken } from 'src/api/core/OpenAPI';
 export { request } from './core/request';
-export type { OpenAPIConfig } from './core/OpenAPI';
+export type { OpenAPIConfig } from 'src/api/core/OpenAPI';
 
 export type { CustomTutorialStep } from './models/CustomTutorialStep';
 export type { AccessRoles } from './models/AccessRole';

src/components/Feature/Feature.test.tsx

@@ -6,7 +6,7 @@ import { waitFor } from '@testing-library/react';
 
 import { CancelablePromise } from 'src/api';
 import { Feature } from 'src/components/Feature/Feature';
-import { AuthProvider, FeatureToggleProvider } from 'src/providers';
+import { FeatureToggleProvider } from 'src/providers';
 import { render, screen } from 'src/tests/test-utils';
 
 import { beforeEach, describe } from 'vitest';
@@ -51,9 +51,9 @@ function Wrappers({ children }: { children: ReactNode }) {
   const queryClient = new QueryClient();
   return (
     <QueryClientProvider client={queryClient}>
-      <AuthProvider>
-        <FeatureToggleProvider>{children}</FeatureToggleProvider>
-      </AuthProvider>
+      <FeatureToggleProvider loadingComponent={<p>loading</p>}>
+        {children}
+      </FeatureToggleProvider>
     </QueryClientProvider>
   );
 }

src/components/Feature/Feature.tsx

@@ -6,16 +6,19 @@ interface FeatureProps {
   featureKey: string;
   children: ReactNode;
   fallback?: DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>;
-  showIfKeyMissing?: boolean;
+  showIfKeyIsMissing?: boolean;
 }
 
 export const Feature: FC<FeatureProps> = ({
   featureKey,
   children,
   fallback,
-  showIfKeyMissing = true,
+  showIfKeyIsMissing = true,
 }) => {
-  const { showContent } = useFeatureToggling(featureKey, showIfKeyMissing);
+  const { showContent } = useFeatureToggling({
+    featureKey,
+    showIfKeyIsMissing,
+  });
 
   if (showContent) {
     return <>{children}</>;

src/hooks/hooks.stories.tsx

@@ -4,25 +4,15 @@ import { Meta, StoryFn } from '@storybook/react';
 import styled from 'styled-components';
 
 const hookList = [
-  {
-    name: 'useSignalRMessages',
-    body: 'Returns service bus messages with wss given a topic + host + token',
-    code: `const {
-     messages,
-     hasUnreadMessages,
-     setMessageAsRead,
-     setAllMessagesAsRead,
-     deleteMessage } = useSignalRMessages<MessageDto>('recap_notifications', 'url', 'token')`,
-  },
   {
     name: 'useFeatureToggling',
     body: 'Returns if a given key should be feature toggled on/off',
     code: 'const { showContent, isLoading } = useFeatureToggling("analytics")',
   },
   {
-    name: 'useAuth',
-    body: 'Returns auth object from AuthProvider',
-    code: 'const { account } = useAuth()',
+    name: 'useReleaseNotesQuery',
+    body: 'Returns release notes for a given app. Has optional options to override app name and enabled (react-query)',
+    code: 'const { data } = useReleaseNotesQuery()',
   },
 ];
 

src/hooks/index.ts

@@ -1,13 +1,4 @@
-import { useAuth } from '../providers/AuthProvider/AuthProvider';
-import { useReleaseNotes } from '../providers/ReleaseNotesProvider';
-import { useTutorialSteps } from '../providers/TutorialStepsProvider';
 import { useFeatureToggling } from './useFeatureToggling';
 import { useReleaseNotesQuery } from './useReleaseNotesQuery';
 
-export {
-  useAuth,
-  useFeatureToggling,
-  useReleaseNotesQuery,
-  useTutorialSteps,
-  useReleaseNotes,
-};
+export { useFeatureToggling, useReleaseNotesQuery };