Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: [IOBP-488] Refactor bonus features to remove cross feature dependencies #5397

Merged
merged 14 commits into from
Jan 15, 2024
+588 −528
Merged

chore: [IOBP-488] Refactor bonus features to remove cross feature dependencies #5397

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
402ed65
refactor: bonuses reduces
mastro993 Jan 12, 2024
677339d
refactor: moved `RemoteValue`
mastro993 Jan 12, 2024
a3e23ae
refactor: moved `bonusVacanze/buttons`
mastro993 Jan 12, 2024
e360858
refactor: moved `LoadingErrorComponent`
mastro993 Jan 12, 2024
52546c7
refactor: moved `bonusVacanze/components/markdown`
mastro993 Jan 12, 2024
381f979
refactor: moved `FooterTopShadow`
mastro993 Jan 12, 2024
9cd47aa
fix: tests
mastro993 Jan 12, 2024
575ded9
fix: imports
mastro993 Jan 12, 2024
76dab28
fix: used correct import
mastro993 Jan 12, 2024
920ec0e
Merge branch 'master' into IOBP-488-remove-cross-dependency-for-bonus…
mastro993 Jan 12, 2024
ff69b75
Merge branch 'master' into IOBP-488-remove-cross-dependency-for-bonus…
mastro993 Jan 15, 2024
461cd45
Merge branch 'master' into IOBP-488-remove-cross-dependency-for-bonus…
forrest57 Jan 15, 2024
a79be7e
Merge branch 'master' into IOBP-488-remove-cross-dependency-for-bonus…
mastro993 Jan 15, 2024
eb284d3
Merge branch 'master' into IOBP-488-remove-cross-dependency-for-bonus…
hevelius Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ts/boot/configureStoreAndPersistor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
persistStore
} from "redux-persist";
import createSagaMiddleware from "redux-saga";
import { remoteUndefined } from "../features/bonus/bpd/model/RemoteValue";
import { remoteUndefined } from "../common/model/RemoteValue";
import { CURRENT_REDUX_LOLLIPOP_STORE_VERSION } from "../features/lollipop/store";
import {
initialLollipopState,
Expand Down
0 ts/features/bonus/bpd/model/RemoteValue.ts → ts/common/model/RemoteValue.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...nusVacanze/components/FooterTopShadow.tsx → ts/components/FooterTopShadow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from "react";
import { View, StyleSheet } from "react-native";
import { IOStyles } from "../../../../components/core/variables/IOStyles";
import variables from "../../../../theme/variables";
import { StyleSheet, View } from "react-native";
import variables from "../theme/variables";
import { IOStyles } from "./core/variables/IOStyles";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use the one exported from @pagopa/io-app-design-system instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure! See 76dab28


// TODO: after bonus vacanze,create a common style for footer, atm duplicated in FooterWithButtons
const styles = StyleSheet.create({
Expand Down
12 changes: 6 additions & 6 deletions ...dingErrorScreen/LoadingErrorComponent.tsx → ts/components/LoadingErrorComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Millisecond } from "@pagopa/ts-commons/lib/units";
import * as React from "react";
import { useEffect } from "react";
import { View, ActivityIndicator, SafeAreaView } from "react-native";
import { IOStyles } from "../../../../../components/core/variables/IOStyles";
import { InfoScreenComponent } from "../../../../../components/infoScreen/InfoScreenComponent";
import GenericErrorComponent from "../../../../../components/screens/GenericErrorComponent";
import { WithTestID } from "../../../../../types/WithTestID";
import { setAccessibilityFocus } from "../../../../../utils/accessibility";
import { ActivityIndicator, SafeAreaView, View } from "react-native";
import { WithTestID } from "../types/WithTestID";
import { setAccessibilityFocus } from "../utils/accessibility";
import { IOStyles } from "./core/variables/IOStyles";
import { InfoScreenComponent } from "./infoScreen/InfoScreenComponent";
import GenericErrorComponent from "./screens/GenericErrorComponent";

export type LoadingErrorProps = WithTestID<{
isLoading: boolean;
Expand Down
2 changes: 1 addition & 1 deletion ts/components/PinCreationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { ButtonOutline, IOColors, VSpacer } from "@pagopa/io-app-design-system";
import * as React from "react";
import { ScrollView, StyleSheet, View } from "react-native";
import { defaultPin } from "../config";
import { confirmButtonProps } from "../features/bonus/bonusVacanze/components/buttons/ButtonConfigurations";
import { isValidPinNumber } from "../features/fastLogin/utils/pinPolicy";
import I18n from "../i18n";
import { trackPinError } from "../screens/profile/analytics";
Expand All @@ -12,6 +11,7 @@ import { PinString } from "../types/PinString";
import { getFlowType } from "../utils/analytics";
import { PIN_LENGTH_SIX } from "../utils/constants";
import { isDevEnv } from "../utils/environment";
import { confirmButtonProps } from "./buttons/ButtonConfigurations";
import { LabelledItem } from "./LabelledItem";
import { InfoBox } from "./box/InfoBox";
import { Body } from "./core/typography/Body";
Expand Down
4 changes: 2 additions & 2 deletions ...omponents/buttons/ButtonConfigurations.ts → ...omponents/buttons/ButtonConfigurations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IOColors, IOIcons } from "@pagopa/io-app-design-system";
import { BlockButtonProps } from "../../../../../components/ui/BlockButtons";
import I18n from "../../../../../i18n";
import { BlockButtonProps } from "../ui/BlockButtons";
import I18n from "../../i18n";

/**
* A common configuration for all the buttons that represent a cancel/abort action
Expand Down
4 changes: 2 additions & 2 deletions ...components/buttons/FooterStackButtons.tsx → ts/components/buttons/FooterStackButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Text as NBButtonText } from "native-base";
import * as React from "react";
import { View, StyleSheet } from "react-native";
import { HSpacer, Icon, VSpacer } from "@pagopa/io-app-design-system";
import ButtonDefaultOpacity from "../../../../../components/ButtonDefaultOpacity";
import { BlockButtonProps } from "../../../../../components/ui/BlockButtons";
import ButtonDefaultOpacity from "../ButtonDefaultOpacity";
import { BlockButtonProps } from "../ui/BlockButtons";
import { FooterTopShadow } from "../FooterTopShadow";

const styles = StyleSheet.create({
Expand Down
2 changes: 1 addition & 1 deletion ts/components/error/WorkunitGenericFailure.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { SafeAreaView } from "react-native";
import { connect } from "react-redux";
import { Dispatch } from "redux";
import image from "../../../img/servicesStatus/error-detail-icon.png";
import { cancelButtonProps } from "../../features/bonus/bonusVacanze/components/buttons/ButtonConfigurations";
import { cancelButtonProps } from "../buttons/ButtonConfigurations";
import I18n from "../../i18n";
import { navigateBack } from "../../store/actions/navigation";
import { IOStyles } from "../core/variables/IOStyles";
Expand Down
2 changes: 1 addition & 1 deletion ...omponents/markdown/FooterSingleButton.tsx → ...omponents/markdown/FooterSingleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import FooterWithButtons from "../../../../../components/ui/FooterWithButtons";
import FooterWithButtons from "../ui/FooterWithButtons";
import { cancelButtonProps } from "../buttons/ButtonConfigurations";

export type OnCancelProps = {
Expand Down
2 changes: 1 addition & 1 deletion .../components/markdown/FooterTwoButtons.tsx → ts/components/markdown/FooterTwoButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import FooterWithButtons from "../../../../../components/ui/FooterWithButtons";
import FooterWithButtons from "../ui/FooterWithButtons";
import {
cancelButtonProps,
confirmButtonProps,
Expand Down
10 changes: 5 additions & 5 deletions ...omponents/markdown/MarkdownBaseScreen.tsx → ...omponents/markdown/MarkdownBaseScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useEffect, useState } from "react";
import * as React from "react";
import { View, StyleSheet } from "react-native";
import BaseScreenComponent from "../../../../../components/screens/BaseScreenComponent";
import { EdgeBorderComponent } from "../../../../../components/screens/EdgeBorderComponent";
import ScreenContent from "../../../../../components/screens/ScreenContent";
import Markdown from "../../../../../components/ui/Markdown";
import themeVariables from "../../../../../theme/variables";
import BaseScreenComponent from "../screens/BaseScreenComponent";
import { EdgeBorderComponent } from "../screens/EdgeBorderComponent";
import ScreenContent from "../screens/ScreenContent";
import Markdown from "../ui/Markdown";
import themeVariables from "../../theme/variables";

/**
* TODO Rename the title prop in the BaseScreenComponent to navigationTitle
Expand Down
2 changes: 1 addition & 1 deletion ts/components/screens/LogoutScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { HSpacer } from "@pagopa/io-app-design-system";
import { Dispatch } from "../../store/actions/types";
import { logoutRequest } from "../../store/actions/authentication";
import I18n from "../../i18n";
import { LoadingErrorComponent } from "../../features/bonus/bonusVacanze/components/loadingErrorScreen/LoadingErrorComponent";
import { LoadingErrorComponent } from "../LoadingErrorComponent";
import BaseScreenComponent from "./BaseScreenComponent";

type Props = ReturnType<typeof mapDispatchToProps>;
Expand Down
2 changes: 1 addition & 1 deletion ts/components/wallet/OutcomeCodeMessageComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import FooterWithButtons from "../ui/FooterWithButtons";
import {
cancelButtonProps,
confirmButtonProps
} from "../../features/bonus/bonusVacanze/components/buttons/ButtonConfigurations";
} from "../buttons/ButtonConfigurations";
import { OutcomeCode } from "../../types/outcomeCode";
import { getFullLocale } from "../../utils/locale";

Expand Down
8 changes: 4 additions & 4 deletions ...bonusVacanze/__mock__/availableBonuses.ts → ...atures/bonus/__mock__/availableBonuses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { BonusAvailable } from "../../../../../definitions/content/BonusAvailable";
import { BonusesAvailable } from "../../../../../definitions/content/BonusesAvailable";
import { BonusAvailable } from "../../../../definitions/content/BonusAvailable";
import { BonusesAvailable } from "../../../../definitions/content/BonusesAvailable";
import {
ID_BONUS_VACANZE_TYPE,
ID_BPD_TYPE,
ID_CGN_TYPE
} from "../utils/bonus";
import { BonusVisibilityEnum } from "../../../../../definitions/content/BonusVisibility";
} from "../common/utils";
import { BonusVisibilityEnum } from "../../../../definitions/content/BonusVisibility";

export const contentBonusVacanzeIT = `#### Chi può richiederlo?

Expand Down
Loading